Add igus to list of supported robot manufacturers (#80)

(cherry picked from commit 3f4aa22) # Conflicts: # doc/supported_robots/supported_robots.rst
ros-controls · Oct 5, 2023 · ca01a68 · ca01a68
1 parent 277e262
commit ca01a68
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/doc/supported_robots/supported_robots.rst b/doc/supported_robots/supported_robots.rst
@@ -9,7 +9,11 @@ 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):