From 4a03971c7c0c67baf0bcfa76262aaebc2a4be6c9 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Fri, 5 May 2017 10:57:28 -0700 Subject: [PATCH] Still trying to fix merge --- src/MissionManager/SimpleMissionItem.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc index a104311..4372d55 100644 --- a/src/MissionManager/SimpleMissionItem.cc +++ b/src/MissionManager/SimpleMissionItem.cc @@ -633,7 +633,6 @@ void SimpleMissionItem::setDefaultsForCommand(void) _missionItem.setParam2(0); break; - case MAV_CMD_NAV_VTOL_LAND: case MAV_CMD_NAV_LAND: case MAV_CMD_NAV_VTOL_LAND: _missionItem.setParam7(0);