Conflicts resolved

Signed-off-by: Juancams <[email protected]>

.github/workflows/main.yaml

@@ -17,11 +17,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup ROS 2
-        uses: ros-tooling/[email protected].1
+        uses: ros-tooling/[email protected].9
         with:
           required-ros-distributions: rolling
       - name: build and test
-        uses: ros-tooling/[email protected].6
+        uses: ros-tooling/[email protected].15
         with:
           package-name: gazebo_mocap4r2_plugin mocap_interfaces mocap4r2_control mocap4r2_control_msgs rqt_mocap4r2_control
           target-ros2-distro: rolling

dependency_repos.repos

@@ -6,8 +6,8 @@ repositories:
   mocap4r2:
     type: git
     url: https://github.com/MOCAP4ROS2-Project/mocap4r2.git
-    version: rep-mocap-jazzy
+    version: rep-mocap
   navigation2:
     type: git
     url: https://github.com/ros-navigation/navigation2.git
-    version: main
+    version: main