Merge conflict screwup

3b60d917 · Gus Grubba · eeba312d · 3b60d917
Commit 3b60d917 authored Jun 19, 2018 by Gus Grubba
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

PlanMasterController.cc src/MissionManager/PlanMasterController.cc +0 -5

No files found.
--- a/src/MissionManager/PlanMasterController.cc
+++ b/src/MissionManager/PlanMasterController.cc
@@ -133,11 +133,6 @@ void PlanMasterController::_activeVehicleChanged(Vehicle* activeVehicle)
        connect(_managerVehicle->rallyPointManager(),   &RallyPointManager::sendComplete,           this, &PlanMasterController::_sendRallyPointsComplete);
    }

-    if (newOffline != _offline) {
-        _offline = newOffline;
-        emit offlineEditingChanged(newOffline);
-    }
-
    _missionController.managerVehicleChanged(_managerVehicle);
    _geoFenceController.managerVehicleChanged(_managerVehicle);
    _rallyPointController.managerVehicleChanged(_managerVehicle);