fix

MDAnalysis · Sep 24, 2024 · 1f7fb5a · 1f7fb5a
1 parent 4ee8e8e
commit 1f7fb5a
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/doc/source/contributing_code.rst b/doc/source/contributing_code.rst
@@ -221,7 +221,6 @@ dependencies, do the following:
 
     .. code-block:: bash
 
-<<<<<<< Updated upstream
         mamba install -c conda-forge \
           'cython>=0.28' \
           'fasteners' \
@@ -321,7 +320,6 @@ dependencies, do the following:
     .. code-block:: bash
 
         python -m pip install \
-<<<<<<< Updated upstream
           'cython>=0.28' \
           'fasteners' \
           'griddataformats>=0.4.0' \