From a7faa58879227dc2ac4e4fda6e104f0885675f73 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 30 Jan 2014 22:35:07 +1100
Subject: [PATCH] Plane: fixed up merge errors

---
 ArduPlane/Log.pde   | 4 ----
 ArduPlane/defines.h | 2 --
 2 files changed, 6 deletions(-)

diff --git a/ArduPlane/Log.pde b/ArduPlane/Log.pde
index 5dc7e5f164..7b8d82fdae 100644
--- a/ArduPlane/Log.pde
+++ b/ArduPlane/Log.pde
@@ -601,10 +601,6 @@ static const struct LogStructure log_structure[] PROGMEM = {
       "ARSP",  "Iffc",     "TimeMS,Airspeed,DiffPress,Temp" },
     { LOG_AHRS2_MSG, sizeof(log_AHRS2), 
       "AHR2","IccCfLL","TimeMS,Roll,Pitch,Yaw,Alt,Lat,Lng" },
-    { LOG_EKF1_MSG, sizeof(log_EKF1), 
-      "EKF1","IccCffffffbbb","TimeMS,Roll,Pitch,Yaw,VN,VE,VD,PN,PE,PD,GX,GY,GZ" },
-    { LOG_EKF2_MSG, sizeof(log_EKF2), 
-      "EKF2","Ibbbcchhhhhh","TimeMS,AX,AY,AZ,VWN,VWE,MN,ME,MD,MX,MY,MZ" },
     TECS_LOG_FORMAT(LOG_TECS_MSG),
 };
 
diff --git a/ArduPlane/defines.h b/ArduPlane/defines.h
index c723a2ac3d..cecb98146b 100644
--- a/ArduPlane/defines.h
+++ b/ArduPlane/defines.h
@@ -143,8 +143,6 @@ enum log_messages {
     LOG_COMPASS2_MSG,
     LOG_ARM_DISARM_MSG,
     LOG_AIRSPEED_MSG,
-    LOG_EKF1_MSG,
-    LOG_EKF2_MSG,
     LOG_AHRS2_MSG, // unused
     MAX_NUM_LOGS // always at the end
 };