From 27f027b3e4fd49cd02a84c690ed925b36a788f2d Mon Sep 17 00:00:00 2001
From: tumbili <bapstr@ethz.ch>
Date: Tue, 27 Oct 2015 09:58:43 +0100
Subject: [PATCH] ported vtol module to posix

---
 src/modules/vtol_att_control/vtol_att_control_main.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/modules/vtol_att_control/vtol_att_control_main.cpp b/src/modules/vtol_att_control/vtol_att_control_main.cpp
index 5ab0d01b1c..b9c2d64fe2 100644
--- a/src/modules/vtol_att_control/vtol_att_control_main.cpp
+++ b/src/modules/vtol_att_control/vtol_att_control_main.cpp
@@ -741,11 +741,7 @@ VtolAttitudeControl::start()
 					   SCHED_DEFAULT,
 					   SCHED_PRIORITY_MAX - 10,
 					   2048,
-<<<<<<< HEAD
 					   (px4_main_t)&VtolAttitudeControl::task_main_trampoline,
-=======
-					   (main_t)&VtolAttitudeControl::task_main_trampoline,
->>>>>>> fixed code style
 					   nullptr);
 
 	if (_control_task < 0) {