https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12532
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #101 from David Nind <[email protected]> --- (In reply to Hammat wele from comment #100) > I've made some fixes to the patch Thanks Hammat! Unfortunately, the patch no longer applies 8-(.. git bz apply 12532 Bug 12532 - Redirect guarantee email to guarantor 150208 - Bug 12532: Send email to guarantee and guarantor Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 12532: Send email to guarantee and guarantor .git/rebase-apply/patch:37: 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/Letters.t .git/rebase-apply/patch:37: 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/Letters.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 CONFLICT (content): Merge conflict in C4/Letters.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 12532: Send email to guarantee and guarantor hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-12532-Send-email-to-guarantee-and-guarantor-W5BJUI.patch -- 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/
