Merge pull request #2130 from alcaeus/remove-conflict-markers

Remove conflict markers
doctrine · Dec 3, 2019 · 2e1d0bf · 2e1d0bf
2 parents 739a87e + 8dad62e
commit 2e1d0bf
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/docs/en/sidebar.rst b/docs/en/sidebar.rst
@@ -17,13 +17,9 @@
 
        reference/introduction
        reference/architecture
-<<<<<<< HEAD
-       reference/basic-mapping
-       reference/custom-mapping-types
-=======
        reference/console-commands
        reference/basic-mapping
->>>>>>> 2.0.x
+       reference/custom-mapping-types
        reference/reference-mapping
        reference/bidirectional-references
        reference/complex-references