Merge conflicts

Signed-off-by: Antón Casas <antoncasas@eprosima.com>

Author: 4ntn

.github/workflows/ci.yml

@@ -22,25 +22,16 @@ jobs:
       container:
         image: ubuntu:jammy
       steps:
-<<<<<<< HEAD
-      - uses: actions/checkout@v3
-      - uses: ros-tooling/setup-ros@0.7.1
-=======
       - uses: actions/checkout@v4
       - uses: ros-tooling/setup-ros@0.7.13
->>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.ros_distribution }}
       - name : Download and install dependencies
         run: |
           apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs
           apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp
-<<<<<<< HEAD
-      - uses : ros-tooling/action-ros-ci@0.3.6
-=======
       - uses : ros-tooling/action-ros-ci@0.4.3
->>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249))
         with:
           package-name: "micro_ros_agent"
           target-ros2-distro: ${{ matrix.ros_distribution }}