segway_self balancing robot 4180 project

Dependencies:   mbed mbed-rtos LSM9DS1_Library

Files at this revision

API Documentation at this revision

Comitter:
pandirimukund
Date:
Thu Apr 09 20:36:33 2020 +0000
Parent:
3:a9e77d6c56f8
Child:
5:cf7df8c086a1
Commit message:
fixed it;

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/main.cpp	Thu Apr 09 20:35:18 2020 +0000
+++ b/main.cpp	Thu Apr 09 20:36:33 2020 +0000
@@ -1,10 +1,6 @@
 #include "mbed.h"
 
-<<<<<<< working copy
 DigitalOut myled(LED3);
-=======
-DigitalOut myled(LED4);
->>>>>>> merge rev
 
 int main() {
     while(1) {