From 96a30937b5b74f59003ac0c8b1bcdda17ad91dd0 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Thu, 30 Nov 2023 20:15:12 +0000 Subject: [PATCH] Revert "fix conflict" This reverts commit c0aaabf19cbb1bb36d30b1348efd2f86caa5f1cf. --- .../test/test_trajectory_controller_utils.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp index e38e6b81ad..8fdf73eab2 100644 --- a/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp +++ b/joint_trajectory_controller/test/test_trajectory_controller_utils.hpp @@ -211,12 +211,16 @@ 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(