Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
35ae7e80
Commit
35ae7e80
authored
Aug 31, 2016
by
boyska
Browse files
FIX some merge conflict markers
parent
1bfc27f1
Changes
5
Hide whitespace changes
Inline
Side-by-side
wiki/src/install/debian/usb/overview.it.po
View file @
35ae7e80
...
...
@@ -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
View file @
35ae7e80
...
...
@@ -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
View file @
35ae7e80
...
...
@@ -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
View file @
35ae7e80
...
...
@@ -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
View file @
35ae7e80
...
...
@@ -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"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment