maxime bouillot / Mbed 2 deprecated 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:
10:f2cb60383040
Parent:
9:19f7cac66f50
Child:
15:3874758e8f7d
--- a/main.cpp	Thu Mar 28 17:27:40 2019 +0000
+++ b/main.cpp	Thu Mar 28 18:07:20 2019 +0000
@@ -1,33 +1,7 @@
 #include "main.h"
 
-<<<<<<< working copy
-int main()
-{
-   while(1){
-    Display_H_1();
-    wait(1);
-    Display_He_2();
-    wait(1);
-    Display_Li_3();
-    wait(1);
-    Display_Be_4();
-    wait(1);
-    Display_O_8();
-    wait(1);
-    Display_C_6();
-    wait(1);
-    Display_N_7();
-    wait(1);
-    Display_F_9();
-    wait(1);
-   }
-   return 1;
-=======
-
-
 int main(){
     DM_Test();
     return 1;
->>>>>>> merge rev
 }