Commit 6395c5e4 authored by Stan Hu's avatar Stan Hu

Merge branch 'sh-fix-locale-pot-2018-11-15' into 'master'

Fix broken master due locale/gitlab.pot

See merge request gitlab-org/gitlab-ee!9179
parents 401441ea 14e5acce
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
type="checkbox" type="checkbox"
name="squash" name="squash"
class="qa-squash-checkbox" class="qa-squash-checkbox"
@change="$emit('input', $event.target.checked);" @change="$emit('input', $event.target.checked)"
/> />
{{ __('Squash commits') }} {{ __('Squash commits') }}
</label> </label>
......
...@@ -8351,9 +8351,6 @@ msgstr "" ...@@ -8351,9 +8351,6 @@ msgstr ""
msgid "Snippet Contents" msgid "Snippet Contents"
msgstr "" msgstr ""
msgid "Snippet Contents"
msgstr ""
msgid "Snippets" msgid "Snippets"
msgstr "" msgstr ""
...@@ -10092,9 +10089,6 @@ msgstr "" ...@@ -10092,9 +10089,6 @@ msgstr ""
msgid "We couldn't find any results matching" msgid "We couldn't find any results matching"
msgstr "" msgstr ""
msgid "We couldn't find any results matching"
msgstr ""
msgid "We detected potential spam in the %{humanized_resource_name}. Please solve the reCAPTCHA to proceed." msgid "We detected potential spam in the %{humanized_resource_name}. Please solve the reCAPTCHA to proceed."
msgstr "" msgstr ""
......
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