From 3b7685a8fe3d251d3235f1b3d9c9289a41dd2bc7 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sun, 23 Aug 2015 11:34:38 +0200 Subject: [PATCH] PWM Sim: Fix merge fail --- src/drivers/pwm_out_sim/pwm_out_sim.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/drivers/pwm_out_sim/pwm_out_sim.cpp b/src/drivers/pwm_out_sim/pwm_out_sim.cpp index 8aae4bcbfe..4bff7c1123 100644 --- a/src/drivers/pwm_out_sim/pwm_out_sim.cpp +++ b/src/drivers/pwm_out_sim/pwm_out_sim.cpp @@ -234,13 +234,8 @@ PWMSim::init() _task = px4_task_spawn_cmd("pwm_out_sim", SCHED_DEFAULT, SCHED_PRIORITY_DEFAULT, -<<<<<<< HEAD:src/drivers/pwm_out_sim/pwm_out_sim.cpp - 1200, - (px4_main_t)&PWMSim::task_main_trampoline, -======= 1000, - (main_t)&HIL::task_main_trampoline, ->>>>>>> beta:src/drivers/hil/hil.cpp + (px4_main_t)&PWMSim::task_main_trampoline, nullptr); if (_task < 0) {