Commit 55806ee4 authored by Glenn Morris's avatar Glenn Morris

* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.

parent 653a81bf
Pipeline #6169 failed with stage
in 11 seconds