Fix merge conflicts

Co-authored-by: Sai Kishor Kothakota <sai.kishor@pal-robotics.com>
ros-controls · Mar 27, 2024 · 30f2248 · 30f2248
1 parent e23d1e0
commit 30f2248
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
@@ -467,8 +467,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;
@@ -512,7 +510,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;