https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15582 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #17 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Liz Rea from comment #15)

Applying: Bug 15582: Ability to block auto renewals if OPACFineNoRenewals is reached fatal: sha1 information is lacking or useless (C4/Circulation.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 15582: Ability to block auto renewals if OPACFineNoRenewals is reached

Easy conflict in tests fixed, but did not get the sha1 error. Make sure you have applied patches from bug 15581 and bug 16344 before. -- You are receiving this mail because: You are watching all bug changes.