From 0b1bcaf0f941b31c2a1623fcafcb6a42a537e50a Mon Sep 17 00:00:00 2001
From: Michael Ferguson <mfergs7@gmail.com>
Date: Sat, 11 Jan 2025 20:32:27 -0500
Subject: [PATCH] fix chomp inclued, closes #3228 (#3229)

(cherry picked from commit 9e0b4dd7a89f8516318fcb9c708da7df941a7394)

# Conflicts:
#	moveit_planners/moveit_planners/package.xml
---
 moveit_planners/moveit_planners/package.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/moveit_planners/moveit_planners/package.xml b/moveit_planners/moveit_planners/package.xml
index 0be9975a9c..6393a3d7a7 100644
--- 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>