Fix merge conflicts

christophfroehlich · saikishor · web-flow · commit 7448544de9cb · 2024-03-27T18:04:51.000+01:00
Co-authored-by: Sai Kishor Kothakota &lt;sai.kishor@pal-robotics.com&gt;
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;

Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,6 @@ TEST_F(TestControllerManagerSrvs, unload_controller_srv)`
`467`	`467`	`EXPECT_EQ(0u, cm_->get_loaded_controllers().size());`
`468`	`468`	`}`
`469`	`469`
`470`		`-<<<<<<< HEAD`
`471`		`-=======`
`472`	`470`	`TEST_F(TestControllerManagerSrvs, robot_description_on_load_and_unload_controller)`
`473`	`471`	`{`
`474`	`472`	`rclcpp::executors::SingleThreadedExecutor srv_executor;`
`@@ -512,7 +510,6 @@ TEST_F(TestControllerManagerSrvs, robot_description_on_load_and_unload_controlle`
`512`	`510`	`test_controller->get_robot_description());`
`513`	`511`	`}`
`514`	`512`
`515`		`->>>>>>> 6f57faf (check for state of the controller node before cleanup (#1363))`
`516`	`513`	`TEST_F(TestControllerManagerSrvs, configure_controller_srv)`
`517`	`514`	`{`
`518`	`515`	`rclcpp::executors::SingleThreadedExecutor srv_executor;`