From b884a620824a9d707cec82c9dddf7ab236263b95 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Thu, 12 Dec 2019 10:04:59 +0100
Subject: conflict resolution

---
 src/python/doc/installation.rst | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/python/doc')

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
 
-- 
cgit v1.2.3