Fixed merge

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
ros-controls · Dec 10, 2024 · ed614f3 · ed614f3
1 parent 74f5f27
commit ed614f3
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -17,12 +17,6 @@ See the [documentation file](doc/index.rst) or [control.ros.org](https://control
 
 ROS 2 Distro | Branch | Build status | Documentation
 :----------: | :----: | :----------: | :-----------:
-<<<<<<< HEAD
-**Rolling** | [`master`](https://github.com/ros-controls/gazebo_ros2_control/tree/master) | n/a | [Documentation](https://control.ros.org/master/doc/gazebo_ros2_control/doc/index.html)
-**Jazzy** | [`master`](https://github.com/ros-controls/gazebo_ros2_control/tree/master) | n/a | [Documentation](https://control.ros.org/jazzy/doc/gazebo_ros2_control/doc/index.html)
-**Iron** | [`iron`](https://github.com/ros-controls/gazebo_ros2_control/tree/iron) | [![Gazebo ros2 control CI](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-iron.yaml/badge.svg?branch=iron)](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-iron.yaml) | [Documentation](https://control.ros.org/iron/doc/gazebo_ros2_control/doc/index.html)
-=======
 **Rolling** | [`master`](https://github.com/ros-controls/gazebo_ros2_control/tree/master) |  [![Gazebo ros2 control CI](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-rolling.yaml/badge.svg?branch=master)](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-rolling.yaml)  | [Documentation](https://control.ros.org/master/doc/gazebo_ros2_control/doc/index.html)
 **Jazzy** | [`master`](https://github.com/ros-controls/gazebo_ros2_control/tree/master) |  [![Gazebo ros2 control CI](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-rolling.yaml/badge.svg?branch=master)](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-rolling.yaml)  | [Documentation](https://control.ros.org/jazzy/doc/gazebo_ros2_control/doc/index.html)
->>>>>>> 2e242fb (Remove iron (#386))
 **Humble** | [`humble`](https://github.com/ros-controls/gazebo_ros2_control/tree/humble) | [![Gazebo ros2 control CI](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-humble.yaml/badge.svg?branch=humble)](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-humble.yaml) | [Documentation](https://control.ros.org/humble/doc/gazebo_ros2_control/doc/index.html)