Merge branch 'jazzy' into mergify/bp/jazzy/pr-3341

moveit · Feb 15, 2025 · be86c31 · be86c31
2 parents 7f6b358 + 6da4b25
commit be86c31
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/moveit_ros/moveit_servo/src/servo_node.cpp b/moveit_ros/moveit_servo/src/servo_node.cpp
@@ -147,8 +147,6 @@ ServoNode::ServoNode(const rclcpp::NodeOptions& options)
 void ServoNode::pauseServo(const std::shared_ptr<std_srvs::srv::SetBool::Request>& request,
                            const std::shared_ptr<std_srvs::srv::SetBool::Response>& response)
 {
-<<<<<<< HEAD
-=======
   if (servo_paused_ == request->data)
   {
     std::string message = "Requested pause state is already active.";
@@ -158,7 +156,6 @@ void ServoNode::pauseServo(const std::shared_ptr<std_srvs::srv::SetBool::Request
     return;
   }
   std::lock_guard<std::mutex> lock_guard(lock_);
->>>>>>> 50b433768 (Update current state even if servo is paused (#3341))
   servo_paused_ = request->data;
   response->success = (servo_paused_ == request->data);
   if (servo_paused_)