navigator: forgot to fix conflicts

This commit is contained in:
Julian Oes
2014-07-07 15:13:27 +02:00
parent 407eafbdbb
commit 530e70bc46
2 changed files with 1 additions and 2 deletions
-1
View File
@@ -124,7 +124,6 @@ Navigator::Navigator() :
_loiter(this, "LOI"),
_rtl(this, "RTL"),
_offboard(this, "OFF"),
_update_triplet_updated(false),
_param_loiter_radius(this, "LOITER_RAD"),
_param_acceptance_radius(this, "ACC_RAD")
{