From 0db2c1ea3d481af7e4532f7967333a5536ca4dfd Mon Sep 17 00:00:00 2001
From: Pablo Garrido <pablogs9@gmail.com>
Date: Mon, 16 Sep 2024 16:27:00 +0200
Subject: [PATCH] update

---
 .github/workflows/ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1cce8c4..59eca478 100644
--- 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/setup-ros@0.7.0
-=======
       - uses: ros-tooling/setup-ros@0.7.9
->>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726))
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ env.ROS_DISTRO }}