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.0
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 }}
7276 path : src/micro_ros_setup
7377 ref : ${{ inputs.ci_target_ref }}
7478
79+ <<<<<<< HEAD
7580 - uses : ros-tooling/setup-ros@0.7.0
81+ =======
82+ - uses : ros-tooling/setup-ros@0.7.13
83+ >>>>>>> 262aa56 (Bump setup-ros (#777))
7684 with :
7785 use-ros2-testing : false
7886 required-ros-distributions : ${{ env.ROS_DISTRO }}
@@ -227,7 +235,11 @@ jobs:
227235 path : src/micro_ros_setup
228236 ref : ${{ inputs.ci_target_ref }}
229237
238+ <<<<<<< HEAD
230239 - uses : ros-tooling/setup-ros@0.7.0
240+ =======
241+ - uses : ros-tooling/setup-ros@0.7.13
242+ >>>>>>> 262aa56 (Bump setup-ros (#777))
231243 with :
232244 use-ros2-testing : false
233245 required-ros-distributions : ${{ env.ROS_DISTRO }}
You can’t perform that action at this time.
0 commit comments