Commit 35ae7e80 authored by boyska's avatar boyska

FIX some merge conflict markers

parent 1bfc27f1
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment