From 3b60d917df9c9f18cfab388e62f31048a794f0fc Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Tue, 19 Jun 2018 00:14:53 -0400
Subject: [PATCH] Merge conflict screwup

---
 src/MissionManager/PlanMasterController.cc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/MissionManager/PlanMasterController.cc b/src/MissionManager/PlanMasterController.cc
index dc10aae02..31d710954 100644
--- 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);
-- 
2.22.0