Fix merge conflicts

ros-controls · Jan 23, 2024 · 32f8788 · 32f8788
1 parent 8c7075f
commit 32f8788
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/.github/workflows/humble-rhel-binary-build.yml b/.github/workflows/humble-rhel-binary-build.yml
@@ -22,17 +22,10 @@ jobs:
       - name: Install dependencies
         run: |
           rosdep update
-<<<<<<< HEAD
-          rosdep install -iy --from-path src/ros2_control
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          colcon build
-          colcon test
-=======
           rosdep install -iyr --from-path src/ros2_control || true
       - name: Build and test
         run: |
           source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
           colcon build --packages-skip rqt_controller_manager
           colcon test --packages-skip rqt_controller_manager ros2controlcli
           colcon test-result --verbose
->>>>>>> fd2cc4e ([RHEL-CI] Rename workflow and don't run on  push (#1326))
diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml
@@ -23,17 +23,10 @@ jobs:
       - name: Install dependencies
         run: |
           rosdep update
-<<<<<<< HEAD
-          rosdep install -iy --from-path src/ros2_control
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          colcon build
-          colcon test
-=======
           rosdep install -iyr --from-path src/ros2_control || true
       - name: Build and test
         run: |
           source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
           colcon build --packages-skip rqt_controller_manager
           colcon test --packages-skip rqt_controller_manager ros2controlcli
           colcon test-result --verbose
->>>>>>> fd2cc4e ([RHEL-CI] Rename workflow and don't run on  push (#1326))