diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-18 08:03:56 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-11-18 08:03:56 +0100 |
| commit | 8b7a25482dfd9c38825e022d5f95135f0aade738 (patch) | |
| tree | e986157f9921aa261a58c8d812f2802cab248310 /src/python/doc/rips_complex_user.rst | |
| parent | d33eaa80b7c337fde11bb5db60df79fbc81fb483 (diff) | |
| parent | ad5d38986542715e0a0518537afaadcda71d9c49 (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` | |