Commit 62a80669 by Sean McGivern

Merge branch 'backport-merge_params-conflict-message-to-ee-master' into 'master'

Backport merge_params.html.haml conflict comment

See merge request !2120
parents 1501d7c9 9acae6ef
Pipeline #9072931 failed with stages
in 101 minutes 40 seconds