From ed491ed03d8d76cdbc42d341f6446c4554f9b0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 27 Mar 2024 18:03:27 +0100 Subject: [PATCH] Fix merge conflicts Co-authored-by: Sai Kishor Kothakota --- controller_manager/test/test_controller_manager_srvs.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/controller_manager/test/test_controller_manager_srvs.cpp b/controller_manager/test/test_controller_manager_srvs.cpp index b01d31fcc4..f1f5c0ea7f 100644 --- a/controller_manager/test/test_controller_manager_srvs.cpp +++ b/controller_manager/test/test_controller_manager_srvs.cpp @@ -466,8 +466,6 @@ TEST_F(TestControllerManagerSrvs, unload_controller_srv) EXPECT_EQ(0u, cm_->get_loaded_controllers().size()); } -<<<<<<< HEAD -======= TEST_F(TestControllerManagerSrvs, robot_description_on_load_and_unload_controller) { rclcpp::executors::SingleThreadedExecutor srv_executor; @@ -511,7 +509,6 @@ TEST_F(TestControllerManagerSrvs, robot_description_on_load_and_unload_controlle test_controller->get_robot_description()); } ->>>>>>> 6f57faf (check for state of the controller node before cleanup (#1363)) TEST_F(TestControllerManagerSrvs, configure_controller_srv) { rclcpp::executors::SingleThreadedExecutor srv_executor;