<<<<<<< HEAD src/MissionManager/UnitTest/SectionTest.plan src/MissionManager/UnitTest/MavCmdInfoCommon.json src/MissionManager/UnitTest/MavCmdInfoFixedWing.json src/MissionManager/UnitTest/MavCmdInfoMultiRotor.json src/MissionManager/UnitTest/MavCmdInfoRover.json src/MissionManager/UnitTest/MavCmdInfoSub.json src/MissionManager/UnitTest/MavCmdInfoVTOL.json src/MissionManager/UnitTest/MissionPlanner.waypoints src/MissionManager/UnitTest/OldFileFormat.mission src/MissionManager/UnitTest/PolygonAreaTest.kml src/MissionManager/UnitTest/PolygonGood.kml src/MissionManager/UnitTest/PolygonMissingNode.kml src/MissionManager/UnitTest/PolygonBadXml.kml src/MissionManager/UnitTest/PolygonBadCoordinatesNode.kml ======= src/MissionManager/UnitTest/SectionTest.plan src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json src/MissionManager/UnitTest/UT-MavCmdInfoMultiRotor.json src/MissionManager/UnitTest/UT-MavCmdInfoRover.json src/MissionManager/UnitTest/UT-MavCmdInfoSub.json src/MissionManager/UnitTest/UT-MavCmdInfoVTOL.json src/MissionManager/UnitTest/MissionPlanner.waypoints src/MissionManager/UnitTest/OldFileFormat.mission src/MissionManager/UnitTest/PolygonAreaTest.kml src/MissionManager/UnitTest/PolygonGood.kml src/MissionManager/UnitTest/PolygonMissingNode.kml src/MissionManager/UnitTest/PolygonBadXml.kml src/MissionManager/UnitTest/PolygonBadCoordinatesNode.kml src/comm/MockLinkOptionsDlg.qml >>>>>>> upstream_merge