conflicto resolvo! *waves wand*

ros-controls · Dec 12, 2023 · a580d3a · a580d3a
1 parent dd13bc4
commit a580d3a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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>