Remove merge_conflicts bundle See merge request gitlab-org/gitlab-ce!17408
Attach a file by drag & drop or click to upload
