From d2d700f4c6d39f5e0eb4e142f74403af6208121c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Wed, 3 Jan 2024 14:03:19 +0100 Subject: [PATCH] fix mergify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- gz_ros2_control/src/gz_ros2_control_plugin.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/gz_ros2_control/src/gz_ros2_control_plugin.cpp b/gz_ros2_control/src/gz_ros2_control_plugin.cpp index 249d4107..c1c8fb03 100644 --- a/gz_ros2_control/src/gz_ros2_control_plugin.cpp +++ b/gz_ros2_control/src/gz_ros2_control_plugin.cpp @@ -297,14 +297,11 @@ void GazeboSimROS2ControlPlugin::Configure( // Get controller manager node name std::string controllerManagerNodeName{"controller_manager"}; -<<<<<<< HEAD:gz_ros2_control/src/gz_ros2_control_plugin.cpp -======= if (sdfPtr->HasElement("controller_manager_name")) { controllerManagerNodeName = sdfPtr->GetElement("controller_manager_name")->Get(); } ->>>>>>> b77f972 (Add controller name parameter (#212)):ign_ros2_control/src/ign_ros2_control_plugin.cpp std::string ns = "/"; // Hold joints if no control mode is active?