From 255da487b1a5f9d6b969c130b7995f4f6317331c Mon Sep 17 00:00:00 2001 From: Bence Magyar Date: Sat, 9 Nov 2024 09:01:16 +0000 Subject: [PATCH] Fix conflict --- controller_manager/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt index 1b37d1459b..47a462e13d 100644 --- a/controller_manager/CMakeLists.txt +++ b/controller_manager/CMakeLists.txt @@ -191,8 +191,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 @@ -202,10 +200,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)