From 9b351df8de6f142725eb0e261c79e6a4af04d12c Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Wed, 17 Aug 2011 20:23:14 +0200
Subject: [PATCH] fix remains of conflict in stabilization_attitude

---
 .../fixedwing/stabilization/stabilization_attitude.c          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
index c301428c03..ac964799ee 100644
--- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
+++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
@@ -123,13 +123,9 @@ void h_ctl_init( void ) {
   h_ctl_course_dgain = H_CTL_COURSE_DGAIN;
   h_ctl_roll_max_setpoint = H_CTL_ROLL_MAX_SETPOINT;
 
-<<<<<<< HEAD
-  h_ctl_pitch_mode = 0;
-=======
 #ifdef USE_AOA
   h_ctl_pitch_mode = 0;
 #endif
->>>>>>> bruzzlee/dev
 
   h_ctl_disabled = FALSE;