Clark Boylan d435c9fd01 Update example zuul config to remove deprecated syntax
The zuul pipeline reporter for merge-failure has been renamed to
merge-conflict. The old name has been depreacted and will be removed in
a future release. Update our examples to match Zuul's current
expectations.

Change-Id: I1f9effa311163d942171e35ba65fafa25245e9d2
2022-09-02 09:23:15 -07:00
..