Merge conflict

walterroach · Nov 21, 2020 · 708b615 · 708b615
1 parent 866ff78
commit 708b615
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 import logging
-=======
->>>>>>> develop_2_2_x
 from typing import Iterable, List, Optional
 
 from PySide2.QtCore import Signal
@@ -20,10 +17,7 @@
 from gen.flights.flightplan import (
     CustomFlightPlan,
     FlightPlanBuilder,
-<<<<<<< HEAD
     PlanningError,
-=======
->>>>>>> develop_2_2_x
     StrikeFlightPlan,
 )
 from qt_ui.windows.mission.flight.waypoints.QFlightWaypointList import \