resolved merge conflict

Signed-off-by: Jan Staschulat (CR/ADA1.2) <[email protected]>
ros2 · Jun 2, 2022 · 4d19531 · 4d19531
1 parent 6096365
commit 4d19531
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,11 +24,7 @@ jobs:
       image: ${{ matrix.docker_image }}
     steps:
     - uses: actions/checkout@v2
-<<<<<<< HEAD
-    - uses: ros-tooling/[email protected]
-=======
     - uses: ros-tooling/[email protected]
->>>>>>> eac6a8d ([rolling] updated ros-tooling versions (#289))
       with:
         use-ros2-testing: true
         required-ros-distributions: ${{ matrix.ros_distribution }}