From a580d3aae0a26033387c09bed7f61087806c3bdc Mon Sep 17 00:00:00 2001
From: Bence Magyar <bence.magyar.robotics@gmail.com>
Date: Tue, 12 Dec 2023 15:21:11 +0000
Subject: [PATCH] conflicto resolvo! *waves wand*

---
 joint_trajectory_controller/package.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/joint_trajectory_controller/package.xml b/joint_trajectory_controller/package.xml
index 99edc64e19..0b5b49087b 100644
--- a/joint_trajectory_controller/package.xml
+++ b/joint_trajectory_controller/package.xml
@@ -20,12 +20,9 @@
   <depend>pluginlib</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_lifecycle</depend>
-<<<<<<< HEAD
-=======
   <depend>realtime_tools</depend>
   <depend>rsl</depend>
   <depend>tl_expected</depend>
->>>>>>> 1d0d753 (Cleanup package.xml und clarify tests of JTC. (#889))
   <depend>trajectory_msgs</depend>
   <depend>generate_parameter_library</depend>