Nicolae Marton / Mbed 2 deprecated TDP3_MovementControl

Dependencies:   mbed

Revision:
4:9827e5952222
Parent:
3:c9e7b856026c
Child:
6:b476699ac7d4
--- a/main.cpp	Mon Oct 15 10:18:56 2018 +0000
+++ b/main.cpp	Mon Oct 15 10:25:10 2018 +0000
@@ -1,5 +1,8 @@
 #include "mbed.h"
 //hello guys, this is a test
+
+//merge conflict for the win
+
 DigitalOut myled(LED1);
 
 // This is the main() function