From c84286cf609d1d524de1016d1017ede85f441c02 Mon Sep 17 00:00:00 2001
From: Bence Magyar <bence.magyar.robotics@gmail.com>
Date: Tue, 16 Jul 2024 20:37:21 +0100
Subject: [PATCH] remove last conflict

---
 .../test/test_trajectory_controller_utils.hpp                 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
index cef03fdf6f..78ef8d120b 100644
--- 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(