Fixed merge

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
ros-controls · Feb 12, 2025 · 71230d2 · 71230d2
1 parent 3636a2f
commit 71230d2
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/README.md b/README.md
@@ -13,11 +13,7 @@ ROS version | Gazebo version | Branch | Binaries hosted at | APT key
 -- | -- | -- | -- | --
 Humble | Fortress | [humble](https://github.com/ros-controls/gz_ros2_control/tree/humble) | https://packages.ros.org | `ros-humble-ign-ros2-control`
 Jazzy | Harmonic | [jazzy](https://github.com/ros-controls/gz_ros2_control/tree/jazzy) | https://packages.ros.org | `ros-jazzy-gz-ros2-control`
-<<<<<<< HEAD
-Rolling | Harmonic | [master](https://github.com/ros-controls/gz_ros2_control/tree/master) | https://packages.ros.org | `ros-rolling-gz-ros2-control`
-=======
-Rolling | Ionic | [rolling](https://github.com/ros-controls/gz_ros2_control/tree/rolling) | https://packages.ros.org | `ros-rolling-gz-ros2-control`
->>>>>>> e72cbee (Default on rolling is ionic (#499))
+Rolling | Ionic | [rolling](https://github.com/ros-controls/gz_ros2_control/tree/master) | https://packages.ros.org | `ros-rolling-gz-ros2-control`
 
 ## Build status