fixing a stash issue

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
         }
     }
 }

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()