giuseppe russo / Sandbox

this is a sandbox

Diff: prova_folder/prova2.cpp

Revision:
6:68b346056d3f
Parent:
5:eba5956307b7
Child:
7:435d766573d1
--- a/prova_folder/prova2.cpp	Wed Oct 07 10:16:00 2015 +0200
+++ b/prova_folder/prova2.cpp	Mon Nov 16 17:17:59 2015 +0100
@@ -1,6 +1,8 @@
-<<<<<<< local
-//prova=======
+<<<<<<< local
+//prova=======
 
 
 
-//prova>>>>>>> other
+//prova>>>>>>> other
+
+///prova2