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: TraceMatrix/Trace.h

Revision:
24:682b9e68dca8
Parent:
23:1d4562f7b639
Child:
26:6e4d3faa34fb
diff -r 1d4562f7b639 -r 682b9e68dca8 TraceMatrix/Trace.h
--- a/TraceMatrix/Trace.h	Fri May 10 14:06:36 2019 +0000
+++ b/TraceMatrix/Trace.h	Fri May 10 14:24:19 2019 +0000
@@ -48,8 +48,6 @@
 
 matrice *BS_dotdot(); //Les deux points entre les heures et les minutes
 
-<<<<<<< working copy
 //Elements
 
-matrice *BS_H();=======
-//Elements>>>>>>> merge rev
+matrice *BS_H();
\ No newline at end of file