From 960f42cfe951dfb5bcd91cfd6e81ad133e4e90d0 Mon Sep 17 00:00:00 2001
From: Sebastian Jahr <sebastian.jahr@picknik.ai>
Date: Mon, 13 Jan 2025 08:50:24 +0100
Subject: [PATCH] Address conflict

---
 .../src/controller_manager_plugin.cpp                     | 8 --------
 1 file changed, 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
index 04249dfcb0..c8e5d42814 100644
--- 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"));