Julesnaps / Mbed 2 deprecated Linefollowproject

Dependencies:   m3pi mbed

Revision:
19:e0a4f9e88383
Parent:
18:91e521f1f0f4
Child:
20:76f94dec91d1
--- a/main.cpp	Tue Oct 11 10:53:43 2022 +0000
+++ b/main.cpp	Tue Oct 11 10:56:07 2022 +0000
@@ -20,11 +20,8 @@
 int PitTest(void);   // Test if to robot needs to goto pit 
 void InitialMessages(void); // Prints initial message to the LCD 
 void LED_Control(int ledNumber, int state); //turn ledNumber to 1=on, 0 = off
-<<<<<<< working copy
-=======
 void PitStop(void); // 
 void Blink(int ledNumber); // make ledNumber blinik
->>>>>>> merge rev
 
 int main() {