fixing a stash issue

2019-09-11 12:33:34 -06:00
parent 10ccd0258b
commit 58a197afbd
2 changed files with 1 additions and 16 deletions
--- a/Drone/DroneComands.cs
+++ b/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
        }
    }
 }