From 4ef6eec63e7c9ca4896dfe14ed5f5c581be84941 Mon Sep 17 00:00:00 2001
From: Igor Brylyov <movefasta@dezcom.org>
Date: Thu, 7 Oct 2021 17:56:43 +0300
Subject: [PATCH] Fix id

---
 sidebars.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sidebars.js b/sidebars.js
index 2dfe3ba..4c8dbf2 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -30,14 +30,10 @@ module.exports = {
         'technologies/wood',
         'technologies/machine-learning-in-robotics',
         'technologies/gripper-tools-research',
-<<<<<<< sidebars.js
         'technologies/o2ac-repo-review',
-        'technologies/moveit2.md',
-        'technologies/dds_and_ros2.md',
+        'technologies/moveit2',
+        'technologies/dds_and_ros2',
         'technologies/plansys2'
-=======
-        'technologies/plansys2'
->>>>>>> sidebars.js
       ],
     },
     {