From 1eb043368ff6c3cd1e1a1badde10678a163ae5d4 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Mon, 19 Feb 2024 21:54:39 +0000
Subject: [PATCH] Fix merge conflict

---
 .../include/joint_trajectory_controller/tolerances.hpp        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
index 0dd85b7d03..c46b1c297f 100644
--- a/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
+++ b/joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
@@ -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)
     {