From 006cf58b2dfe78661c3395cabc414285b8dc702d Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Thu, 13 Feb 2014 11:40:30 +0900
Subject: [PATCH] Copter: fix merge error for g.angle_max

---
 ArduCopter/motors.pde | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ArduCopter/motors.pde b/ArduCopter/motors.pde
index d58e64a150..584aa43d5e 100644
--- a/ArduCopter/motors.pde
+++ b/ArduCopter/motors.pde
@@ -469,7 +469,7 @@ static bool arm_checks(bool display_failure)
 
     // check lean angle
     if ((g.arming_check == ARMING_CHECK_ALL) || (g.arming_check & ARMING_CHECK_INS)) {
-        if (labs(ahrs.roll_sensor) > g.angle_max || labs(ahrs.pitch_sensor) > g.angle_max) {
+        if (labs(ahrs.roll_sensor) > aparm.angle_max || labs(ahrs.pitch_sensor) > aparm.angle_max) {
             if (display_failure) {
                 gcs_send_text_P(SEVERITY_HIGH,PSTR("Arm: Leaning"));
             }