maxime bouillot
/
testLucadeTHmaxBOUI
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: LCD_DISCO_F429ZI mbed BSP_DISCO_F429ZI
Diff: main.cpp
- Revision:
- 9:19f7cac66f50
- Parent:
- 6:4ef1fabb6c47
- Parent:
- 8:ae92c165d2da
- Child:
- 10:f2cb60383040
--- a/main.cpp Thu Mar 14 10:59:43 2019 +0000
+++ b/main.cpp Thu Mar 28 17:27:40 2019 +0000
@@ -1,5 +1,6 @@
#include "main.h"
+<<<<<<< working copy
int main()
{
while(1){
@@ -21,5 +22,12 @@
wait(1);
}
return 1;
+=======
+
+
+int main(){
+ DM_Test();
+ return 1;
+>>>>>>> merge rev
}
