Pipeline Technology Centre
/
ConsolTest
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
Diff: main.cpp
- Revision:
- 42:b9055f46cfed
- Parent:
- 41:93e728f291f3
- Child:
- 43:8e154016dd89
--- a/main.cpp Wed Jul 08 10:49:31 2015 +0000
+++ b/main.cpp Wed Jul 08 14:36:51 2015 +0000
@@ -8,9 +8,6 @@
int main(void)
{
-<<<<<<< local
- calculate(distance());
-=======
- data(1,3);
->>>>>>> other
+
+
}
\ No newline at end of file