Update controller_manager_services.py

ros-controls · Oct 25, 2024 · b3615ae · b3615ae
1 parent 4c6e413
commit b3615ae
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/controller_manager/controller_manager/controller_manager_services.py b/controller_manager/controller_manager/controller_manager_services.py
@@ -105,13 +105,8 @@ def service_caller(
         rclpy.spin_until_future_complete(node, future, timeout_sec=call_timeout)
         if future.result() is None:
             node.get_logger().warning(
-<<<<<<< HEAD
                 f"Failed getting a result from calling {service_name} in "
-                f"{service_timeout}. (Attempt {attempt+1} of {max_attempts}.)"
-=======
-                f"Failed getting a result from calling {fully_qualified_service_name} in "
                 f"{call_timeout}. (Attempt {attempt+1} of {max_attempts}.)"
->>>>>>> cb91599 (Fix timeout value in std output (#1807))
             )
         else:
             return future.result()