From 708b615ad740c7fbcc849fd4c8ccd4a76a7d64cc Mon Sep 17 00:00:00 2001
From: walterroach <37820425+walterroach@users.noreply.github.com>
Date: Sat, 21 Nov 2020 11:18:30 -0600
Subject: [PATCH] Merge conflict

---
 .../windows/mission/flight/waypoints/QFlightWaypointTab.py  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
index 6bc74eaa6..791c7d5bc 100644
--- 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 \