From c84d5501f83c0ecaee0bfef3c80aee39c31c5eab Mon Sep 17 00:00:00 2001
From: Arthur Golubtsov <goldartt@gmail.com>
Date: Fri, 12 Jul 2019 17:19:43 +0300
Subject: [PATCH] Fix merge conflict

---
 Drone/FlightLib/FlightLib.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Drone/FlightLib/FlightLib.py b/Drone/FlightLib/FlightLib.py
index 57a7443..cb653a1 100644
--- a/Drone/FlightLib/FlightLib.py
+++ b/Drone/FlightLib/FlightLib.py
@@ -396,8 +396,5 @@ def flip(min_z = FLIP_MIN_Z, frame_id = FRAME_ID): #TODO Flip in different direc
         logger.info('Flip succeeded!')
         #print('Flip succeeded!')
         navto(x=start_telemetry.x, y=start_telemetry.y, z=start_telemetry.z, yaw=start_telemetry.yaw, frame_id=frame_id)   # finish flip
-<<<<<<< HEAD
-=======
 
         return True
->>>>>>> alpha