From c748eb67574963798d4a96c0a0b99165aed902d4 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 25 Mar 2016 16:28:51 -0400
Subject: [PATCH] cleanup mission params

---
 src/modules/navigator/mission_params.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/modules/navigator/mission_params.c b/src/modules/navigator/mission_params.c
index ef44cda38d..1ee45bdbfe 100644
--- a/src/modules/navigator/mission_params.c
+++ b/src/modules/navigator/mission_params.c
@@ -102,13 +102,8 @@ PARAM_DEFINE_FLOAT(MIS_DIST_1WP, 900);
  * @unit enum
  * @min 0
  * @max 1
-<<<<<<< e22e0b28b61a7b4f7d10756678b8f4b533b3622e
  * @value 0 Zero Order Hold
  * @value 1 First Order Hold
-=======
- * @value 0 zero order
- * @value 1 first order
->>>>>>> mission param @unit
  * @group Mission
  */
 PARAM_DEFINE_INT32(MIS_ALTMODE, 1);
@@ -121,17 +116,10 @@ PARAM_DEFINE_INT32(MIS_ALTMODE, 1);
  * @unit enum
  * @min 0
  * @max 3
-<<<<<<< e22e0b28b61a7b4f7d10756678b8f4b533b3622e
  * @value 0 Heading as set by waypoint
  * @value 1 Heading towards waypoint
  * @value 2 Heading towards home
  * @value 3 Heading away from home
-=======
- * @value 0 destination
- * @value 1 next
- * @value 2 home
- * @value 3 home back
->>>>>>> mission param @unit
  * @group Mission
  */
 PARAM_DEFINE_INT32(MIS_YAWMODE, 1);
@@ -144,9 +132,9 @@ PARAM_DEFINE_INT32(MIS_YAWMODE, 1);
  * Mainly useful for VTOLs that have less yaw authority and might not reach target
  * yaw in wind. Disabled by default.
  *
+ * @unit s
  * @min -1
  * @max 20
- * @unit second
  * @increment 1
  * @group Mission
  */
@@ -158,7 +146,6 @@ PARAM_DEFINE_FLOAT(MIS_YAW_TMT, -1.0f);
  * @unit deg
  * @min 0
  * @max 90
- * @unit degree
  * @increment 1
  * @group Mission
  */