giuseppe russo / Sandbox

this is a sandbox

Diff: prova_folder/prova2.cpp

Revision:
8:646a85c00967
Parent:
7:435d766573d1
Child:
9:77c394e4cba7
--- a/prova_folder/prova2.cpp	Tue Nov 17 08:52:24 2015 +0100
+++ b/prova_folder/prova2.cpp	Tue Nov 17 07:59:05 2015 +0000
@@ -1,4 +1,4 @@
-<<<<<<< local
+//removed comment
 //prova=======