remove last conflict

ros-controls · Jul 16, 2024 · c84286c · c84286c
1 parent e6e6ac1
commit c84286c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
@@ -362,7 +362,6 @@ class TrajectoryControllerTest : public ::testing::Test
 
   static void TearDownTestCase() { rclcpp::shutdown(); }
 
-<<<<<<< HEAD
   void subscribeToStateLegacy()
   {
     auto traj_lifecycle_node = traj_controller_->get_node();
@@ -385,10 +384,7 @@ class TrajectoryControllerTest : public ::testing::Test
         });
   }
 
-  void subscribeToState()
-=======
   void subscribeToState(rclcpp::Executor & executor)
->>>>>>> 2674f6d (Fix WaitSet issue in tests  (#1206))
   {
     auto traj_lifecycle_node = traj_controller_->get_node();
     traj_lifecycle_node->set_parameter(