diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-12-12 10:04:59 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-12-12 10:04:59 +0100 |
| commit | b884a620824a9d707cec82c9dddf7ab236263b95 (patch) | |
| tree | beca0211dba1c0831f80c1b33b587a299eb6c51f /src | |
| parent | cec28c5ee04886ff30d4f3960d713e044837ff4f (diff) | |
conflict resolution
Diffstat (limited to 'src')
| -rw-r--r-- | src/python/doc/installation.rst | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/python/doc/installation.rst b/src/python/doc/installation.rst index 14000ecf..50a697c7 100644 --- a/src/python/doc/installation.rst +++ b/src/python/doc/installation.rst @@ -99,16 +99,9 @@ following `Ctest <https://cmake.org/cmake/help/latest/manual/ctest.1.html>`_ export PYTHONPATH='$PYTHONPATH:/path-to-gudhi/build/python' ctest -<<<<<<< HEAD .. note:: One can use :code:`ctest` specific options in the python directory: -======= -`make test` is using -`Ctest <https://cmake.org/cmake/help/latest/manual/ctest.1.html>`_ (CMake test -driver program). If some of the tests are failing, please send us the result of -the following command: ->>>>>>> a1b6e5a034bc698b02d3c93e1707cab5622eaea6 .. code-block:: bash |