Skip to content

G
gitlab-ce
Commit ce3bacaf authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

removed conflict markers in GitLab.pot

parent 52788202
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 11 deletions
locale/gitlab.pot
View file @ ce3bacaf
...@@ -8,13 +8,8 @@ msgid "" ...@@ -8,13 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-09-27 16:26+0200\n" "POT-Creation-Date: 2017-09-27 16:26+0200\n"
"PO-Revision-Date: 2017-09-27 16:26+0200\n" "PO-Revision-Date: 2017-09-27 16:26+0200\n"
=======
"POT-Creation-Date: 2017-09-26 16:01+0100\n"
"PO-Revision-Date: 2017-09-26 16:01+0100\n"
>>>>>>> EE port of fix-translation-namespaces
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -218,12 +213,6 @@ msgid "BillingPlans|per user" ...@@ -218,12 +213,6 @@ msgid "BillingPlans|per user"
msgstr "" msgstr ""
msgid "Billinglans|Downgrade" msgid "Billinglans|Downgrade"
<<<<<<< HEAD
msgstr ""
msgid "Board"
=======
>>>>>>> EE port of fix-translation-namespaces
msgstr "" msgstr ""
msgid "Branch" msgid "Branch"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7