Branch 'f14' - it-IT/Database_Servers.po it-IT/File_Systems.po

[votta luigi]

 it-IT/Database_Servers.po |    4 ----
 it-IT/File_Systems.po     |    8 --------
 2 files changed, 12 deletions(-)

New commits:
commit 0b998b8c0c88f09affc49f5489fca2b0f5ffe7c0
Author: luigi votta <lewis41 at fedoraproject.org>
Date:   Tue Sep 14 09:46:50 2010 +0200

    l10n: it-IT Removed trash merging text

diff --git a/it-IT/Database_Servers.po b/it-IT/Database_Servers.po
index 6fc7bfd..77ea5c2 100644
--- a/it-IT/Database_Servers.po
+++ b/it-IT/Database_Servers.po
@@ -16,11 +16,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "Database Servers"
-<<<<<<< HEAD
-msgstr "Database Servers"
-=======
 msgstr "Database Server"
->>>>>>> it-branch
 
 #. Tag: para
 #, no-c-format
diff --git a/it-IT/File_Systems.po b/it-IT/File_Systems.po
index 443894f..ab9fd34 100644
--- a/it-IT/File_Systems.po
+++ b/it-IT/File_Systems.po
@@ -5,11 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0\n"
 "POT-Creation-Date: 2010-09-07T00:34:22\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2010-09-13 20:08+0100\n"
-=======
-"PO-Revision-Date: 2010-09-13 22:16+0100\n"
->>>>>>> it-branch
 "Last-Translator: luigi votta <lewis41 at fedoraproject.org>\n"
 "Language-Team: None\n"
 "Language: \n"
@@ -20,11 +16,7 @@ msgstr ""
 #. Tag: title
 #, no-c-format
 msgid "File Systems"
-<<<<<<< HEAD
-msgstr "File Systems"
-=======
 msgstr "File System"
->>>>>>> it-branch
 
 #. Tag: para
 #, no-c-format