Fix merge conflicts

Co-authored-by: Sai Kishor Kothakota <[email protected]>
ros-controls · Mar 27, 2024 · 5d03eea · 5d03eea
1 parent 95a2a9e
commit 5d03eea
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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;