https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23295
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #17 from David Nind <[email protected]> --- The patch no longer applies 8-(.... git bz apply 23295 Bug 23295 - Automatically debar patrons if SMS or email notice fail 160890 - Bug 23295: Automatically restrict (debar) patrons when email/sms notices fail Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 23295: Automatically restrict (debar) patrons when email/sms notices fail Using index info to reconstruct a base tree... M Koha/Notice/Message.pm M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref .git/rebase-apply/patch:130: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql Auto-merging Koha/Notice/Message.pm CONFLICT (content): Merge conflict in Koha/Notice/Message.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 23295: Automatically restrict (debar) patrons when email/sms notices fail -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
