commander: fix merge conflict mistake

2016-05-06 11:10:16 +02:00 · 2016-05-06 11:10:16 +02:00 · 352d099249
parent 30b6f9ff6c
commit 352d099249
1 changed files with 1 additions and 0 deletions
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@ -2872,6 +2872,7 @@ check_valid(hrt_abstime timestamp, hrt_abstime timeout, bool valid_in, bool *val
 	}
 }

+void
 control_status_leds(vehicle_status_s *status_local, const actuator_armed_s *actuator_armed, bool changed, battery_status_s *battery, const cpuload_s *cpuload_local)
 {
 	/* driving rgbled */