Clark Boylan 28fff67469 Update deprecated zuul syntax
merge-failure has become merge-conflict in pipeline reporting
configurations. The old syntax has been deprecated and will be removed
soon. Update our examples to match current expectations.

Change-Id: I7b3f07d071d52e4e6fe906e9037b489ae2455b43
2022-09-02 09:19:09 -07:00
..
2022-09-02 09:19:09 -07:00