Skip to content

Resolve 'docs/object-storage-ee' Conflicts

Clement Ho requested to merge 9-3-stable-ee-rc6-storage into 9-3-stable-ee-rc6

Attempt to pick https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2147 created conflicts

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

	both modified:   config/gitlab.yml.example
	both modified:   doc/administration/job_artifacts.md

Merge request reports