Fix conflicts.

ros-controls · Feb 6, 2024 · 32ad176 · 32ad176
1 parent 32531ae
commit 32ad176
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
@@ -1,4 +1,4 @@
-// Copyright 2013 PAL Robotics S.L.
+ // Copyright 2013 PAL Robotics S.L.
 // All rights reserved.
 //
 // Software License Agreement (BSD License 2.0)
@@ -147,11 +147,7 @@ inline bool check_state_tolerance_per_joint(
   if (show_errors)
   {
     const auto logger = rclcpp::get_logger("tolerances");
-<<<<<<< HEAD
-    RCLCPP_ERROR(logger, "State tolerances failed for joint %d:", joint_idx);
-=======
     RCLCPP_ERROR(logger, "State tolerances failed for joint %lu:", joint_idx);
->>>>>>> 833ed7f ([JTC] Convert lambda to class functions (#945))
 
     if (state_tolerance.position > 0.0 && abs(error_position) > state_tolerance.position)
     {