Fixed git merge conflict

ranguli · Aug 14, 2018 · 8f8e96c · 8f8e96c
1 parent c32f07b
commit 8f8e96c
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/help/source/index.rst b/help/source/index.rst
@@ -11,27 +11,14 @@ User Documentation
 .. toctree::
    :maxdepth: 2
    :numbered:
-<<<<<<< HEAD
 
-=======
-   :caption: Developer Documentation
-
->>>>>>> 26129d2513ad43386c8f9067ef46dd00a9c9af86
-   Installation for Users <user/installation>
-
 Developer Documentation
 ------------------------
 .. toctree::
    :maxdepth: 2
    :numbered:
-<<<<<<< HEAD
 
-   Installation for Developers <installation>
    Project Structure <project_structure>
-=======
-   :caption: Developer Documentation
->>>>>>> 26129d2513ad43386c8f9067ef46dd00a9c9af86
-
    Installation for Developers <installation>
    Modules <marvis>
    Build Errors / Troubleshooting <troubleshooting>