Minor resolution

MBTMBTMBT · Jun 24, 2024 · d36a96f · d36a96f
1 parent 6425a57
commit d36a96f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tasks/receptionist/src/receptionist/states/seat_guest.py b/tasks/receptionist/src/receptionist/states/seat_guest.py
@@ -6,9 +6,6 @@
 
 import numpy as np
 
-<<<<<<< HEAD
-from lasr_skills import PlayMotion, Detect3DInArea, LookToPoint, Say, WaitForPerson
-=======
 from geometry_msgs.msg import Point, PointStamped
 from lasr_skills import (
     PlayMotion,
@@ -18,7 +15,6 @@
     WaitForPerson,
     Wait,
 )
->>>>>>> 5026ebfb0cc02564e84da9d05b79c6aa6d85b8f3
 
 
 class GuestSeatWait(smach.State):