File tree Expand file tree Collapse file tree 1 file changed +12
-0
lines changed
Expand file tree Collapse file tree 1 file changed +12
-0
lines changed Original file line number Diff line number Diff line change 2424 path : src/micro_ros_setup
2525 ref : ${{ inputs.ci_target_ref }}
2626
27+ <<<<<<< HEAD
2728 - uses : ros-tooling/setup-ros@0.7.9
29+ =======
30+ - uses : ros-tooling/setup-ros@0.7.13
31+ >>>>>>> 262aa56 (Bump setup-ros (#777))
2832 with :
2933 use-ros2-testing : false
3034 required-ros-distributions : ${{ env.ROS_DISTRO }}
7074 path : src/micro_ros_setup
7175 ref : ${{ inputs.ci_target_ref }}
7276
77+ <<<<<<< HEAD
7378 - uses : ros-tooling/setup-ros@0.7.9
79+ =======
80+ - uses : ros-tooling/setup-ros@0.7.13
81+ >>>>>>> 262aa56 (Bump setup-ros (#777))
7482 with :
7583 use-ros2-testing : false
7684 required-ros-distributions : ${{ env.ROS_DISTRO }}
@@ -219,7 +227,11 @@ jobs:
219227 path : src/micro_ros_setup
220228 ref : ${{ inputs.ci_target_ref }}
221229
230+ <<<<<<< HEAD
222231 - uses : ros-tooling/setup-ros@0.7.9
232+ =======
233+ - uses : ros-tooling/setup-ros@0.7.13
234+ >>>>>>> 262aa56 (Bump setup-ros (#777))
223235 with :
224236 use-ros2-testing : false
225237 required-ros-distributions : ${{ env.ROS_DISTRO }}
You can’t perform that action at this time.
0 commit comments