gz_ros2_control: Use correct branches for rolling + jazzy (#578)

* Use renamed rolling branch * Update jazzy as well (cherry picked from commit a97beed) # Conflicts: # ros2_control_demos.rolling.repos
ros-controls · Jan 15, 2025 · 4d213a1 · 4d213a1
1 parent 15a8cea
commit 4d213a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ros2_control_demos.jazzy.repos b/ros2_control_demos.jazzy.repos
@@ -18,4 +18,4 @@ repositories:
   gz_ros2_control:
     type: git
     url: https://github.com/ros-controls/gz_ros2_control.git
-    version: master
+    version: jazzy
diff --git a/ros2_control_demos.rolling.repos b/ros2_control_demos.rolling.repos
@@ -17,5 +17,10 @@ repositories:
     version: master
   gazebo_ros2_control:
     type: git
+<<<<<<< HEAD
     url: https://github.com/ros-controls/gazebo_ros2_control.git
     version: master
+=======
+    url: https://github.com/ros-controls/gz_ros2_control.git
+    version: rolling
+>>>>>>> a97beed (gz_ros2_control: Use correct branches for rolling + jazzy (#578))