Address conflict

moveit · Jan 13, 2025 · 960f42c · 960f42c
1 parent d910360
commit 960f42c
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/moveit_plugins/moveit_ros_control_interface/src/controller_manager_plugin.cpp b/moveit_plugins/moveit_ros_control_interface/src/controller_manager_plugin.cpp
@@ -264,14 +264,6 @@ class Ros2ControlManager : public moveit_controller_manager::MoveItControllerMan
         node_->get_parameter<std::string>("ros_control_namespace", ns_);
       }
     }
-<<<<<<< HEAD
-    else if (node->has_parameter("ros_control_namespace"))
-    {
-      node_->get_parameter<std::string>("ros_control_namespace", ns_);
-      RCLCPP_INFO_STREAM(LOGGER, "Namespace for controller manager was specified, namespace: " << ns_);
-    }
-=======
->>>>>>> 256646748 (Update controller_manager_plugin.cpp (#3179))
 
     list_controllers_service_ = node_->create_client<controller_manager_msgs::srv::ListControllers>(
         getAbsName("controller_manager/list_controllers"));