From 60f4878a08ab90262e3415aa7cd6e782d4dc1589 Mon Sep 17 00:00:00 2001
From: u-siri-ous <sanninosiria@gmail.com>
Date: Thu, 12 Mar 2020 11:16:23 +0100
Subject: [PATCH] fix last merge

---
 src/main.cpp      | 7 +------
 src/test_menu.cpp | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ef48ca0..223d48f 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,15 +24,10 @@ void loop() {
   testmenu.testMenu();
   goalie->play(role==1);
   keeper->play(role==0);
-<<<<<<< HEAD
- */
-drive->m1->test();
-=======
 
   camera->test();
 
->>>>>>> 4cd4b8f9d6012a435a9d2e4f1e1983a0adf3475e
   // Last thing to do: movement and update status vector
   drive->drivePrepared();  
-  updateStatusVector();
+  updateStatusVector(); */
 } 
diff --git a/src/test_menu.cpp b/src/test_menu.cpp
index 771b7b5..1b10f00 100644
--- a/src/test_menu.cpp
+++ b/src/test_menu.cpp
@@ -56,6 +56,7 @@ void TestMenu :: testMenu(){
             case '0':
                 DEBUG.println("Exiting test menu, may the odds be in your favor c:");
                 flagtest = false;
+                DEBUG.flush();
                 return;
             break;
             case '1':