Projet_S5 / Mbed 2 deprecated Repo_Noeud_Mobile_refactor

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:   mbed-rtos mbed

Fork of Repo_Noeud_Mobile by Projet_S5

Diff: Communication/Xbee.h

Revision:
22:cccb77300fd5
Parent:
21:98232c148ed6
Child:
23:5bb76b7c35da
--- a/Communication/Xbee.h	Sun Mar 22 17:32:47 2015 +0000
+++ b/Communication/Xbee.h	Sun Mar 22 19:57:40 2015 +0000
@@ -9,11 +9,7 @@
         Xbee(short panId, PinName pinTx, PinName pinRx);
         ~Xbee();
         Mail<message,32> Mailbox;
-<<<<<<< local
-    
         void EnvoyerDonnees(char data[], int messageSize);
-=======
->>>>>>> other
         void Envoyer(char array[], int size);
         void Recevoir();
     private: