merge confilct manual resolution

2017-09-08 12:23:23 -04:00 · 2017-09-08 12:23:23 -04:00 · f03b76c241
parent 663bd5e4ed
commit f03b76c241
1 changed files with 0 additions and 4 deletions
--- a/buzz_scripts/graphform.bzz
+++ b/buzz_scripts/graphform.bzz
@ -797,11 +797,7 @@ function init() {
  v_tag = stigmergy.create(m_lockstig)
  uav_initstig()
 	# go to diff. height since no collision avoidance implemented yet
-<<<<<<< HEAD
-	TARGET_ALTITUDE = 4.5 #2.5 + id * 1.5
-=======
 	TARGET_ALTITUDE = 7.5 #2.5 + id * 1.5
->>>>>>> d587cdba4387b65bcc583671d26ce82fa4e25720
 	statef=turnedoff
 	UAVSTATE = "TURNEDOFF"
 }