Bump setup-ros and action-ros-ci (#249)

Signed-off-by: Antón Casas <[email protected]>
(cherry picked from commit 0e6e8e3)

# Conflicts:
#	.github/workflows/ci.yml

Author: 4ntn

.github/workflows/ci.yml

@@ -23,15 +23,19 @@ jobs:
         image: ${{ matrix.docker_image }}
       steps:
       - uses: actions/checkout@v4
-      - uses: ros-tooling/[email protected].7
+      - uses: ros-tooling/[email protected].13
         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/[email protected]
+=======
+      - uses : ros-tooling/[email protected]
+>>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249))
         with:
           package-name: "micro_ros_agent"
           target-ros2-distro: ${{ matrix.ros_distribution }}