diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-28 19:04:29 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-28 19:04:29 +0300 |
| commit | ac273ede17998f6f8a76b2634d7e42cc701786e7 (patch) | |
| tree | 73ff1e4deed741379744a339ea4cc82d37909690 | |
| parent | 40be7b3388a3383a018e6cd9cfcc59f837aed0c7 (diff) | |
Resolve locale/gitlab.pot
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | locale/gitlab.pot | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 58c0c6cad37..aa012896e0a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4524,7 +4524,6 @@ msgstr "" msgid "Import timed out. Import took longer than %{import_jobs_expiration} seconds" msgstr "" -<<<<<<< HEAD msgid "ImportButtons|Connect repositories from" msgstr "" @@ -4537,8 +4536,6 @@ msgstr "" msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." msgstr "" -======= ->>>>>>> upstream/master msgid "In order to enable instance-level analytics, please ask an admin to enable %{usage_ping_link_start}usage ping%{usage_ping_link_end}." msgstr "" |