update

micro-ROS · Sep 16, 2024 · cd0d8fc · cd0d8fc
1 parent 0db2c1e
commit cd0d8fc
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,11 +24,7 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ inputs.ci_target_ref }}
 
-<<<<<<< HEAD
-      - uses: ros-tooling/[email protected]
-=======
       - uses: ros-tooling/[email protected]
->>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -69,11 +65,7 @@ jobs:
           path: src/micro_ros_setup
           ref: ${{ inputs.ci_target_ref }}
 
-<<<<<<< HEAD
-      - uses: ros-tooling/[email protected]
-=======
       - uses: ros-tooling/[email protected]
->>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}