summaryrefslogtreecommitdiff
path: root/src/python/doc/rips_complex_user.rst
diff options
context:
space:
mode:
authorMathieuCarriere <mathieu.carriere3@gmail.com>2020-04-28 10:31:12 -0400
committerMathieuCarriere <mathieu.carriere3@gmail.com>2020-04-28 10:31:12 -0400
commit51ca2370ae27bec052bb4fffafc8a718ac306264 (patch)
tree67e1ea14d4c290295b0298dba0d701303a53f3b6 /src/python/doc/rips_complex_user.rst
parent910f29401e053f668e4d277af098295ab05e6022 (diff)
parent0fb22e4c499b665ad505e5d9d2c325f7561f69c4 (diff)
fix conflict
Diffstat (limited to 'src/python/doc/rips_complex_user.rst')
-rw-r--r--src/python/doc/rips_complex_user.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/doc/rips_complex_user.rst b/src/python/doc/rips_complex_user.rst
index a27573e8..8efb12e6 100644
--- a/src/python/doc/rips_complex_user.rst
+++ b/src/python/doc/rips_complex_user.rst
@@ -8,7 +8,7 @@ Definition
----------
==================================================================== ================================ ======================
-:Authors: Clément Maria, Pawel Dlotko, Vincent Rouvreau, Marc Glisse :Introduced in: GUDHI 2.0.0 :Copyright: GPL v3
+:Authors: Clément Maria, Pawel Dlotko, Vincent Rouvreau, Marc Glisse :Since: GUDHI 2.0.0 :License: GPL v3
==================================================================== ================================ ======================
+-------------------------------------------+----------------------------------------------------------------------+