https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20256 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply Keywords|rel_22_05_candidate |rel_22_11_candidate --- Comment #381 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Kyle, could you please rebase? I was hoping someone else would look into the case we disagreed about, but now ready to try and tackle this again. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20256: Update database Applying: Bug 20256: Add new permission to editor Applying: Bug 20256: Refactor subs for rights to view patrons to make them generic for general use Applying: Bug 20256: Add new methods for checking item editing permissions Applying: Bug 20256: Update groups editor Applying: Bug 20256: Use new methods Using index info to reconstruct a base tree... M Koha/Item.pm M Koha/UI/Table/Builder/Items.pm M catalogue/detail.pl M catalogue/moredetail.pl M cataloguing/additem.pl M koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt M tools/batchMod.pl Falling back to patching base and 3-way merge... Auto-merging tools/batchMod.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc Auto-merging cataloguing/additem.pl Auto-merging catalogue/moredetail.pl CONFLICT (content): Merge conflict in catalogue/moredetail.pl Auto-merging catalogue/detail.pl CONFLICT (content): Merge conflict in catalogue/detail.pl Auto-merging Koha/UI/Table/Builder/Items.pm CONFLICT (content): Merge conflict in Koha/UI/Table/Builder/Items.pm Auto-merging Koha/Item.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 20256: Use new methods -- You are receiving this mail because: You are watching all bug changes.