weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict

Browse Source
This commit is contained in:
walterroach 2020-11-21 11:18:30 -06:00
parent 866ff78518
commit 708b615ad7
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
View File

@ -1,7 +1,4 @@
<<<<<<< HEAD
import logging import logging
=======
>>>>>>> develop_2_2_x
from typing import Iterable, List, Optional from typing import Iterable, List, Optional
from PySide2.QtCore import Signal from PySide2.QtCore import Signal
@ -20,10 +17,7 @@ from gen.flights.flight import Flight, FlightType, FlightWaypoint
from gen.flights.flightplan import ( from gen.flights.flightplan import (
CustomFlightPlan, CustomFlightPlan,
FlightPlanBuilder, FlightPlanBuilder,
<<<<<<< HEAD
PlanningError, PlanningError,
=======
>>>>>>> develop_2_2_x
StrikeFlightPlan, StrikeFlightPlan,
) )
from qt_ui.windows.mission.flight.waypoints.QFlightWaypointList import \ from qt_ui.windows.mission.flight.waypoints.QFlightWaypointList import \