FIX some merge conflict markers

wiki/src/install/debian/usb/overview.it.po

@@ -5,7 +5,6 @@
 #
 msgid ""
 msgstr ""
-<<<<<<< HEAD
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-17 09:18+0300\n"
 "PO-Revision-Date: 2016-07-09 19:16+0200\n"

wiki/src/install/expert/usb/overview.it.po

@@ -5,7 +5,6 @@
 #
 msgid ""
 msgstr ""
-<<<<<<< HEAD
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-17 09:18+0300\n"
 "PO-Revision-Date: 2016-07-17 15:20+0200\n"

wiki/src/install/linux/usb.it.po

@@ -167,13 +167,8 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-<<<<<<< HEAD
-msgid "   [[!img install/inc/screenshots/gnome_disks_system.png class=\"screenshot\" link=\"no\" alt=\"\"]]\n"
-msgstr ""
-=======
 msgid "   [[!img install/inc/screenshots/gnome_disks_system.png class=\"screenshot\" link=\"no\"]]\n"
 msgstr "   [[!img install/inc/screenshots/gnome_disks_system.png class=\"screenshot\" link=\"no\"]]\n"
->>>>>>> traduzioni
 
 #. type: Plain text
 #, no-wrap

wiki/src/install/mac/dvd.it.po

@@ -5,7 +5,6 @@
 #
 msgid ""
 msgstr ""
-<<<<<<< HEAD
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-17 09:18+0300\n"
 "PO-Revision-Date: 2016-07-29 14:33+0200\n"

wiki/src/install/mac/usb/overview.it.po

@@ -5,7 +5,6 @@
 #
 msgid ""
 msgstr ""
-<<<<<<< HEAD
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-08-17 09:18+0300\n"
 "PO-Revision-Date: 2016-07-29 14:49+0200\n"