From c889fcb5926fcf00d28db78595603681570ac8a0 Mon Sep 17 00:00:00 2001
From: Guido Serra aka Zeph <zeph@fsfe.org>
Date: Thu, 23 Sep 2010 20:55:57 +0200
Subject: [PATCH] merge a culo

---
 config/locales/it.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 44f8a8033..4cce93d73 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -3,20 +3,8 @@
 #   the COPYRIGHT file.
 
 
-<<<<<<< HEAD
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-#   
-#   1st DRAFT of the italian translation
-#   09/2010	Guido Serra aka Zeph <zeph@fsfe.org>
-
-it:
-  hello: "Ciao Mondo!"
-=======
 # Sample localization file for Italian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 it:
   hello: "Ciao Mondo"
->>>>>>> af91eb51b4ff8d001bbdceba4b4e9e45db498190