![](/media/cache/group/default_image.jpg.50x50_q85.jpg)
02/07/15
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