From f03b76c241437b6f458a16d6ce0d453d2455b996 Mon Sep 17 00:00:00 2001
From: David St-Onge <david.st-onge@polymtl.ca>
Date: Fri, 8 Sep 2017 12:23:23 -0400
Subject: [PATCH] merge confilct manual resolution

---
 buzz_scripts/graphform.bzz | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/buzz_scripts/graphform.bzz b/buzz_scripts/graphform.bzz
index 1b397e9..ef03438 100644
--- 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"
 }