Commit 11a86807 authored by Stan Hu's avatar Stan Hu

Resolve conflicts in local/gitlab.pot

parent 68d3119c
......@@ -8500,7 +8500,6 @@ msgstr ""
msgid "importing"
msgstr ""
<<<<<<< HEAD
msgid "instance completed"
msgid_plural "instances completed"
msgstr[0] ""
......@@ -8513,9 +8512,9 @@ msgid "is invalid because there is upstream lock"
msgstr ""
msgid "is not a valid X509 certificate."
=======
msgstr ""
msgid "issue boards"
>>>>>>> upstream/master
msgstr ""
msgid "latest version"
......
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