Update supported_robots.rst

ros-controls · Oct 5, 2023 · 04c91e8 · 04c91e8
1 parent ca01a68
commit 04c91e8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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):