From 8dad62ee5c0a6c00a4f6eb6c3422f125290e4340 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 3 Dec 2019 15:13:39 +0100 Subject: [PATCH] Remove conflict markers --- docs/en/sidebar.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/en/sidebar.rst b/docs/en/sidebar.rst index c3f3393c03..19eedbaf31 100644 --- 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