https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12532 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #90 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. Applying: Bug 12532 - Send emails to guarantee and guarantor .git/rebase-apply/patch:33: trailing whitespace. unless ($to_address) { warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M C4/Letters.pm M Koha/Patron.pm M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref M t/db_dependent/Members.t .git/rebase-apply/patch:33: trailing whitespace. unless ($to_address) { warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Members.t CONFLICT (content): Merge conflict in t/db_dependent/Members.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql Auto-merging Koha/Patron.pm Auto-merging C4/Letters.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 12532 - Send emails to guarantee and guarantor -- You are receiving this mail because: You are watching all bug changes.