diff options
author | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-08-05 10:18:19 +0200 |
---|---|---|
committer | Vincent Rouvreau <vincent.rouvreau@inria.fr> | 2022-08-05 10:18:19 +0200 |
commit | 2b4bf47e209225a56687b2a7fa65b27ef4b00ab2 (patch) | |
tree | e876553cc2f8c18e0f504a33b26230d0e3e491ed /src/python/doc/rips_complex_sum.inc | |
parent | 3253e504a0564bc75ffd4b1351e800593ffefd0f (diff) | |
parent | 7fa45f4f0c7fb89abf64bc61b26a6201ace16a7a (diff) |
Merge master and fix conflicts
Diffstat (limited to 'src/python/doc/rips_complex_sum.inc')
-rw-r--r-- | src/python/doc/rips_complex_sum.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/python/doc/rips_complex_sum.inc b/src/python/doc/rips_complex_sum.inc index 2cb24990..6931ebee 100644 --- a/src/python/doc/rips_complex_sum.inc +++ b/src/python/doc/rips_complex_sum.inc @@ -11,4 +11,7 @@ | | | | +----------------------------------------------------------------+------------------------------------------------------------------------+----------------------------------------------------------------------------------+ | * :doc:`rips_complex_user` | * :doc:`rips_complex_ref` | - +----------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------+ + +----------------------------------------------------------------+------------------------------------------------------------------------+----------------------------------------------------------------------------------+ + | | * :doc:`rips_complex_tflow_itf_ref` | :requires: `TensorFlow <installation.html#tensorflow>`_ | + | | | | + +----------------------------------------------------------------+------------------------------------------------------------------------+----------------------------------------------------------------------------------+ |