ARES / Mbed 2 deprecated Robot 2015

Robot's source code

Dependencies:   mbed

Diff: main.cpp

Revision:
21:5443f93819db
Parent:
20:2840a749fb55
Child:
22:80fdb12c167f
--- a/main.cpp	Sun Dec 14 17:30:27 2014 +0000
+++ b/main.cpp	Sun Dec 14 17:31:52 2014 +0000
@@ -22,15 +22,14 @@
 /*---------------------------------------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------------------------------------*/
 
-<<<<<<< local
 /*----------------------------------------------------------------------------------------------*/
     /*Serial*/    
     Serial pcs(USBTX, USBRX); // tx, rx
 /*----------------------------------------------------------------------------------------------*/
-=======
+
 /* --- Initialisation de la liste des obstable --- */
 int Obstacle::lastId = 0;
->>>>>>> other
+
 
 int main()
 {