fix chomp inclued, closes #3228 (#3229)

(cherry picked from commit 9e0b4dd) # Conflicts: # moveit_planners/moveit_planners/package.xml
moveit · Jan 12, 2025 · 0b1bcaf · 0b1bcaf
1 parent 51de436
commit 0b1bcaf
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/moveit_planners/moveit_planners/package.xml b/moveit_planners/moveit_planners/package.xml
@@ -19,10 +19,14 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
+<<<<<<< HEAD
   <!--
   <exec_depend>chomp_motion_planner</exec_depend>
   <exec_depend>moveit_planners_chomp</exec_depend>
   -->
+=======
+  <exec_depend>moveit_planners_chomp</exec_depend>
+>>>>>>> 9e0b4dd7a (fix chomp inclued, closes #3228 (#3229))
   <exec_depend>moveit_planners_ompl</exec_depend>
   <exec_depend>pilz_industrial_motion_planner</exec_depend>