diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-02 09:25:06 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-02 09:25:06 +0100 |
| commit | af5af2df409576035f2e31564f4048278d4f0f19 (patch) | |
| tree | 44fde353aa1e7c41e680c153182af0933b489487 /src/python/doc/rips_complex_user.rst | |
| parent | 4186971033ee43821905cac53791bf074751d3af (diff) | |
| parent | 6b995c03793096459a333c907b606770113b96d7 (diff) | |
Merge master and resolve conflicts
Diffstat (limited to 'src/python/doc/rips_complex_user.rst')
| -rw-r--r-- | src/python/doc/rips_complex_user.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/python/doc/rips_complex_user.rst b/src/python/doc/rips_complex_user.rst index 6048cc4e..27d218d4 100644 --- a/src/python/doc/rips_complex_user.rst +++ b/src/python/doc/rips_complex_user.rst @@ -7,9 +7,9 @@ Rips complex user manual Definition ---------- -==================================================================== ================================ ====================== -:Authors: Clément Maria, Pawel Dlotko, Vincent Rouvreau, Marc Glisse :Since: GUDHI 2.0.0 :License: GPL v3 -==================================================================== ================================ ====================== +================================================================================ ================================ ====================== +:Authors: Clément Maria, Pawel Dlotko, Vincent Rouvreau, Marc Glisse, Yuichi Ike :Since: GUDHI 2.0.0 :License: GPL v3 +================================================================================ ================================ ====================== +-------------------------------------------+----------------------------------------------------------------------+ | :doc:`rips_complex_user` | :doc:`rips_complex_ref` | |