Remove spurious conflict messages

Signed-off-by: Jannic Holzer <jannic.holzer@quantumblack.com>
kedro-org · Mar 29, 2023 · 199a0c3 · 199a0c3
1 parent 93c849d
commit 199a0c3
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -188,7 +188,6 @@ Welcome to Kedro's documentation!
 
 .. toctree::
    :maxdepth: 2
-<<<<<<< HEAD
    :caption: Databricks integration
 
    databricks_integration/visualisation
@@ -201,26 +200,16 @@ Welcome to Kedro's documentation!
 
 .. toctree::
    :maxdepth: 2
-<<<<<<< HEAD
-<<<<<<< HEAD
    :caption: FAQs
-=======
-=======
->>>>>>> 8d4757f6 (Revise index.rst)
-   :caption: Resources
->>>>>>> 03ed7288 (Revise index.rst)
 
    faq/faq
    faq/architecture_overview
    faq/kedro_principles
 
 .. toctree::
    :maxdepth: 2
-=======
->>>>>>> main
    :caption: Resources
 
-   faq/faq
    resources/glossary