Fix conflict

ros-controls · Oct 31, 2024 · 1dadd5c · 1dadd5c
1 parent 3afba42
commit 1dadd5c
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt
@@ -190,8 +190,6 @@ if(BUILD_TESTING)
     ros2_control_test_assets::ros2_control_test_assets
   )
 
-<<<<<<< HEAD
-=======
   ament_add_gmock(test_hardware_spawner
     test/test_hardware_spawner
     TIMEOUT 120
@@ -201,10 +199,6 @@ if(BUILD_TESTING)
     ros2_control_test_assets::ros2_control_test_assets
   )
 
-  install(FILES test/test_controller_spawner_with_fallback_controllers.yaml
-    DESTINATION test)
-
->>>>>>> 5dbd6d5 (Fix Hardware spawner and add tests for it (#1759))
   install(FILES test/test_controller_spawner_with_type.yaml
   DESTINATION test)