From c0d155535bf32a30f7657c51edb680d1c2957060 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Thu, 30 Nov 2023 20:17:46 +0000 Subject: [PATCH] Fix merge conflict --- .../test/test_trajectory_controller_utils.hpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp index 8fdf73eab2..e60e715ad2 100644 --- a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp +++ b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp @@ -211,16 +211,7 @@ 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)) + return traj_controller_->init(controller_name_, "", node_options); } void SetPidParameters(