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/Missions.cs
+++ b/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()