From 04c91e8629091b062b009e6d6628451a9ceac221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Thu, 5 Oct 2023 10:46:51 +0200
Subject: [PATCH] Update supported_robots.rst

---
 doc/supported_robots/supported_robots.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/supported_robots/supported_robots.rst b/doc/supported_robots/supported_robots.rst
index 2a3b0d3f552..e1b3dd3a336 100644
--- a/doc/supported_robots/supported_robots.rst
+++ b/doc/supported_robots/supported_robots.rst
@@ -9,11 +9,8 @@ Official (supported by robot manufacturer):
 * `Universal Robots <https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver>`_
 * `Franka Emika research robots <https://github.com/frankaemika/franka_ros2>`_
 * `xArm <https://github.com/xarm-Developer/xarm_ros2>`_
-<<<<<<< HEAD
 * `Flexiv Robotics Rizon robots <https://github.com/flexivrobotics/flexiv_ros2>`_
-=======
 * `igus/Commonplace Robotics <https://github.com/CommonplaceRobotics/iRC_ROS>`_
->>>>>>> 3f4aa22 (Add igus to list of supported robot manufacturers (#80))
 
 Unofficial (from the community):