Merge branch 'test-conflicts' into 'master'

Test conflicts See merge request gitlab-org/gitlab-foss!14778

Merge branch 'test-conflicts' into 'master'
ff274277 · gitlab-qa-bot · 3c45906b · 8dff76d7 · ff274277
Commit ff274277 authored 5 years ago by gitlab-qa-bot
--- a/a
+++ b/a
+xxxxx
+
+xx
+
+xxx
+
+xxx
\ No newline at end of file