Fix merge conflicts

christophfroehlich · saikishor · web-flow · commit 5d03eea5892d · 2024-03-27T18:03:27.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
@@ -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;

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