From 58a197afbd9536a0d59472d415974d258e3866d8 Mon Sep 17 00:00:00 2001
From: bbod <bradybod@gmail.com>
Date: Wed, 11 Sep 2019 12:33:34 -0600
Subject: [PATCH] fixing a stash issue

---
 Tello Drone/DroneComands.cs | 10 ----------
 Tello Drone/Missions.cs     |  7 +------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Tello Drone/DroneComands.cs b/Tello Drone/DroneComands.cs
index 067e498..5686a01 100644
--- a/Tello Drone/DroneComands.cs	
+++ b/Tello Drone/DroneComands.cs	
@@ -35,23 +35,13 @@ namespace Tello_Drone
 
         private void SendCommand(string message)
         {
-<<<<<<< Updated upstream
             _udpClient.TrySend(message, 5_000, 3);
-=======
-            var returnValue = _udpClient.TrySend(message, 5_000, 3);
-            if (returnValue == false)
-                SendCommand("land");
->>>>>>> Stashed changes
         }
 
         private bool TrySendCommand(string message)
         {
-<<<<<<< Updated upstream
             return _udpClient.TrySend(message, 20_000, 3);
-=======
-            return _udpClient.TrySend(message, 5_000, 3);
 
->>>>>>> Stashed changes
         }
     }
 }
diff --git a/Tello Drone/Missions.cs b/Tello Drone/Missions.cs
index 10f4e11..ef61a48 100644
--- a/Tello Drone/Missions.cs	
+++ b/Tello Drone/Missions.cs	
@@ -33,15 +33,10 @@ namespace Tello_Drone
             MissionSetup();
             _drone.BackFlip();
             _drone.FrontFlip();
-<<<<<<< Updated upstream
             _drone.Reverse(300);
             _drone.Forward(66);
             _drone.Up(20);
-            MissionTeardown();            
-=======
-            _drone.Forward(30);
-            _drone.Land();
->>>>>>> Stashed changes
+            MissionTeardown();
         }
 
         private void MissionSetup()