[Koha-bugs] [Bug 33223] Koha::Patron->notice_email_address isn't consistently used

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33223

David Cook <dcook at prosentient.com.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #3 from David Cook <dcook at prosentient.com.au> ---
Bug 33223 - Koha::Patron->notice_email_address isn't consistently used

148168 - Bug 33223: Replace 'first_valid' with 'notice' for email addresses

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 33223: Replace 'first_valid' with 'notice' for email addresses
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
M       opac/opac-sendbasket.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-sendbasket.pl
CONFLICT (content): Merge conflict in opac/opac-sendbasket.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
error: Failed to merge in the changes.
Patch failed at 0001 Bug 33223: Replace 'first_valid' with 'notice' for email
addresses
hint: Use 'git am --show-current-patch' 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-33223-Replace-firstvalid-with-notice-for-email-t8SwfM.patch

-- 
You are receiving this mail because:
You are watching all bug changes.