Add Flexiv Robotics robots (#138)

Co-authored-by: Christoph Fröhlich <[email protected]> (cherry picked from commit 6e82c37) # Conflicts: # doc/supported_robots/supported_robots.rst
ros-controls · Oct 5, 2023 · 11f12a8 · 11f12a8
1 parent 48cff17
commit 11f12a8
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,9 +9,13 @@ 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
 * `igus/Commonplace Robotics <https://github.com/CommonplaceRobotics/iRC_ROS>`_
 * `Husarion ROSbot XL <https://github.com/husarion/rosbot_xl_ros>`_
 * `Husarion ROSbot 2R / 2 PRO <https://github.com/husarion/rosbot_ros>`_
+=======
+* `Flexiv Robotics Rizon robots <https://github.com/flexivrobotics/flexiv_ros2>`_
+>>>>>>> 6e82c37 (Add Flexiv Robotics robots (#138))
 
 Unofficial (from the community):