Resolve conflicts

ros-controls · Jan 26, 2024 · 224f6c8 · 224f6c8
1 parent 878decf
commit 224f6c8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml
@@ -31,13 +31,10 @@ jobs:
             controller_manager
             controller_manager_msgs
             hardware_interface
-<<<<<<< HEAD
             ros2controlcli
             ros2_control
             ros2_control_test_assets
-=======
             hardware_interface_testing
->>>>>>> 0bdcd41 (Move `test_components` to own package (#1325))
             transmission_interface
 
           vcs-repo-file-url: |

diff --git a/controller_manager/package.xml b/controller_manager/package.xml
@@ -28,11 +28,8 @@
   <depend>std_msgs</depend>
 
   <test_depend>ament_cmake_gmock</test_depend>
-<<<<<<< HEAD
-=======
   <test_depend>hardware_interface_testing</test_depend>
   <test_depend>ros2_control_test_assets</test_depend>
->>>>>>> 0bdcd41 (Move `test_components` to own package (#1325))
 
   <export>
     <build_type>ament_cmake</build_type>