ported vtol module to posix

9 years ago · 27f027b3e4
1 changed files with 0 additions and 4 deletions
--- 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()
				@@ -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) {