Clark Boylan b9828899a7 Update deprecated merge-failure zuul syntax
The zuul pipeline reporter for merge-failure is now canonically called
merge-conflict. The old name has been deprecated and will be removed in
the near future. Update our config to use the new name.

Change-Id: Iaf49c8231618c7a24a0dca7f23d5b3770818dc80
2022-09-02 09:20:34 -07:00
..
2022-07-14 09:53:18 +10:00