https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14610 --- Comment #190 from Liz Rea <liz@catalyst.net.nz> --- Hi, Looks like this is not applying (however, it looks like an easy conflict to fix) Falling back to patching base and 3-way merge... Auto-merging Koha/Patron.pm CONFLICT (content): Merge conflict in Koha/Patron.pm Liz -- You are receiving this mail because: You are watching all bug changes.