From 8184dd1c6fb0d7864a9de69fe0352b71b1a9a812 Mon Sep 17 00:00:00 2001
From: brettpac <brettpac@system76-pc.localdomain>
Date: Sat, 28 Sep 2024 15:15:33 -0700
Subject: [PATCH] more conflict bs

---
 .../sm_panda_moveit2z_cb_inventory.hpp                    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/smacc2_sm_reference_library/sm_panda_moveit2z_cb_inventory/include/sm_panda_moveit2z_cb_inventory/sm_panda_moveit2z_cb_inventory.hpp b/smacc2_sm_reference_library/sm_panda_moveit2z_cb_inventory/include/sm_panda_moveit2z_cb_inventory/sm_panda_moveit2z_cb_inventory.hpp
index e56c5757..039bb9c7 100644
--- a/smacc2_sm_reference_library/sm_panda_moveit2z_cb_inventory/include/sm_panda_moveit2z_cb_inventory/sm_panda_moveit2z_cb_inventory.hpp
+++ b/smacc2_sm_reference_library/sm_panda_moveit2z_cb_inventory/include/sm_panda_moveit2z_cb_inventory/sm_panda_moveit2z_cb_inventory.hpp
@@ -88,7 +88,6 @@ struct SmPandaMoveit2zCbInventory : public smacc2::SmaccStateMachineBase<SmPanda
 
 // STATES
 #include "states/st_acquire_sensors.hpp"
-<<<<<<< HEAD
 #include "states/st_pause_1.hpp"
 #include "states/st_pause_2.hpp"
 #include "states/st_pause_3.hpp"
@@ -99,13 +98,6 @@ struct SmPandaMoveit2zCbInventory : public smacc2::SmaccStateMachineBase<SmPanda
 #include "states/st_move_end_effector.hpp"
 #include "states/st_circular_pivot_motion.hpp"
 #include "states/st_move_joints_1.hpp"
-=======
-#include "states/st_acquire_sensors_3.hpp"
-#include "states/st_attach_object.hpp"
-#include "states/st_move_end_effector.hpp"
-#include "states/st_circular_pivot_motion.hpp"
-#include "states/st_move_joints.hpp"
->>>>>>> humble
 #include "states/st_move_joints_2.hpp"
 #include "states/st_move_joints_3.hpp"
 #include "states/st_detach_object.hpp"