https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35871 --- Comment #12 from David Nind <david@davidnind.com> --- I can no longer apply to test, sorry. I applied patch 35870, now 35871 doesn't apply cleanly: git bz apply 35871 Bug 35871 Depends on bug 35870 (Needs Signoff) Follow? [(y)es, (n)o] n Bug 35871 - Adding a merge_delete_authorities subpermission for editauthorities 177495 - Bug 35871: Add new subpermission merge_delete_authorities Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35871: Add new subpermission merge_delete_authorities Using index info to reconstruct a base tree... M authorities/merge.pl M koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt M koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc Auto-merging authorities/merge.pl CONFLICT (content): Merge conflict in authorities/merge.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 35871: Add new subpermission merge_delete_authorities -- You are receiving this mail because: You are watching all bug changes.