Skip to content

Resolve "Missing translations for the project & repository pages" conflicts

username-removed-408677 requested to merge 9-3-stable-rc3-translations into 9-3-stable-rc3

When picking https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12052 into 9.3 RC3, there was a conflict.

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/assets/javascripts/locale/en/app.js
	both modified:   app/assets/javascripts/locale/es/app.js
	both modified:   app/views/projects/pipeline_schedules/_form.html.haml
	both modified:   locale/en/gitlab.po
	both modified:   locale/es/gitlab.po
	both modified:   locale/gitlab.pot
Edited by username-removed-408677

Merge request reports