From 4b3140e5f7f34dfe47bf9ea08ea288c9df096367 Mon Sep 17 00:00:00 2001
From: Paul Riseborough <p_riseborough@live.com.au>
Date: Wed, 16 Jan 2019 17:48:48 +1100
Subject: [PATCH] EKF: Fix rebase error

---
 EKF/control.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EKF/control.cpp b/EKF/control.cpp
index 849e12e645..489e17b900 100644
--- a/EKF/control.cpp
+++ b/EKF/control.cpp
@@ -614,7 +614,7 @@ void Ekf::controlGpsFusion()
 				// use GPS velocity data to check and correct yaw angle if a FW vehicle
 				if (_control_status.flags.fixed_wing && _control_status.flags.in_air) {
 					// if flying a fixed wing aircraft, do a complete reset that includes yaw
-					_flt_mag_align_complete = realignYawGPS();
+					_control_status.flags.mag_align_complete = realignYawGPS();
 				}
 
 				resetVelocity();