fix conflict

ros-controls · Nov 30, 2023 · c0aaabf · c0aaabf
1 parent 8372b90
commit c0aaabf
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
@@ -211,16 +211,12 @@ class TrajectoryControllerTest : public ::testing::Test
     parameter_overrides.insert(parameter_overrides.end(), parameters.begin(), parameters.end());
     node_options.parameter_overrides(parameter_overrides);
 
-<<<<<<< HEAD
     auto ret = traj_controller_->init(controller_name_, "", node_options);
     if (ret != controller_interface::return_type::OK)
     {
       FAIL();
     }
     executor.add_node(traj_controller_->get_node()->get_node_base_interface());
-=======
-    return traj_controller_->init(controller_name_, "", 0, "", node_options);
->>>>>>> fcc0847 ([JTC] Activate checks for parameter validation (#857))
   }
 
   void SetPidParameters(