giuseppe russo / Sandbox

this is a sandbox

Diff: prova_folder/prova2.cpp

Revision:
5:eba5956307b7
Parent:
4:f8f3448857a6
Parent:
3:05720fff67b5
Child:
6:68b346056d3f
--- a/prova_folder/prova2.cpp	Wed Oct 07 10:06:45 2015 +0200
+++ b/prova_folder/prova2.cpp	Wed Oct 07 10:16:00 2015 +0200
@@ -1,1 +1,6 @@
-//prova
\ No newline at end of file
+<<<<<<< local
+//prova=======
+
+
+
+//prova>>>>>>> other