test merge conflicts for Release Tools (!32098) · Merge requests · GitLab.org / GitLab · GitLab

Yorick Peterse requested to merge yorick/test-merge-conflicts into yorick/stable-test May 14, 2020

This is a test merge request for gitlab-com/gl-infra/delivery#851 (closed) to see how we may resolve conflicts. This merge request can be ignored.

Edited May 14, 2020 by Yorick Peterse