[empathy] Updated Italian translation

[Milo Casagrande <miloc src gnome org>]

commit 72bf0c495eae881203eaa15ce839a77ce9034968
Author: Milo Casagrande <milo ubuntu com>
Date:   Fri Nov 6 21:35:17 2009 +0100

    Updated Italian translation

 po/it.po |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/po/it.po b/po/it.po
index d7b9ef5..10b1a31 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,16 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
-<<<<<<< HEAD
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 21:53+0200\n"
-"PO-Revision-Date: 2009-10-09 21:52+0200\n"
-=======
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=empathy&component=general\n"
 "POT-Creation-Date: 2009-10-02 16:41+0000\n"
 "PO-Revision-Date: 2009-11-06 21:34+0100\n"
->>>>>>> 94c7648... Updated Italian translation
 "Last-Translator: Milo Casagrande <milo ubuntu com>\n"
 "Language-Team: Italian <tp lists linux it>\n"
 "MIME-Version: 1.0\n"
@@ -1089,12 +1083,8 @@ msgstr "(%s)"
 msgid "%s has joined the room"
 msgstr "%s entra nella stanza"
 
-<<<<<<< HEAD
-#: ../libempathy-gtk/empathy-chat.c:1366 ../src/empathy-call-window.c:1295
-=======
 # (ndt) plurale per comprendere uomini e donne
 #: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1295
->>>>>>> 94c7648... Updated Italian translation
 msgid "Disconnected"
 msgstr "Disconnessi"