Update fleet race WPs

WRSC · Aug 30, 2019 · 09515eb · 09515eb
1 parent 4d9a709
commit 09515eb
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/analyse_fleet_race b/analyse_fleet_race
@@ -40,17 +40,10 @@ def latlon_to_utm(lat, lon):
 #          | \
 #          |   \
 #   D<-----C    A
-<<<<<<< HEAD
 wpA = [29.86713941, 121.53897552]
 wpB = [29.86705406, 121.53859978]
 wpC = [29.86720864, 121.53867803]
 wpD = [29.86729537, 121.53840194]
-=======
-wpA = (29.863003, 121.542088)
-wpB = (29.863291, 121.541788)
-wpC = (29.863025, 121.541750)
-wpD = (29.863014, 121.541450)
->>>>>>> 3d898dba45a50628b6216b39567a68d591e43741
 RADIUS = 5 #acceptance radius in m
 
 #######################################################################################