Pipeline Technology Centre
02/07/15
Dependencies: mbed
Diff: main.cpp
- Revision:
- 41:93e728f291f3
- Parent:
- 39:3527578e78dd
- Parent:
- 40:23008d8111d5
- Child:
- 42:b9055f46cfed
--- a/main.cpp Wed Jul 08 10:41:29 2015 +0000
+++ b/main.cpp Wed Jul 08 10:49:31 2015 +0000
@@ -8,5 +8,9 @@
int main(void)
{
+<<<<<<< local
calculate(distance());
+=======
+ data(1,3);
+>>>>>>> other
}
\ No newline at end of file