update

micro-ROS · Sep 16, 2024 · 0db2c1e · 0db2c1e
1 parent 404769f
commit 0db2c1e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -221,11 +221,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 }}