more conflict bs

robosoft-ai · Sep 28, 2024 · 8184dd1 · 8184dd1
1 parent b05aa0e
commit 8184dd1
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/...2z_cb_inventory/include/sm_panda_moveit2z_cb_inventory/sm_panda_moveit2z_cb_inventory.hpp b/...2z_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"