[Koha-bugs] [Bug 3150] Move emails for sending cart and list contents into notices tool

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

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

David Nind <david at davidnind.com> changed:

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

--- Comment #91 from David Nind <david at davidnind.com> ---
Patch no longer applies 8-(..

git bz apply 3150

Bug 3150 - Move emails for sending cart and list contents into notices tool

134304 - Bug 3150: Move emails for sending cart and list contents to notices
134305 - Bug 3150: (follow-up) HTML filtering TT notices and removing old files
134306 - Bug 3150: (follow-up) Reformat notices, don't send if no sender email
134307 - Bug 3150: (follow-up) Add missing bracket
134477 - Bug 3150: (follow-up) Fixing errors and notices

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 3150: Move emails for sending cart and list contents to notices
Using index info to reconstruct a base tree...
M       installer/data/mysql/en/mandatory/sample_notices.yml
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/en/mandatory/sample_notices.yml
CONFLICT (content): Merge conflict in
installer/data/mysql/en/mandatory/sample_notices.yml
error: Failed to merge in the changes.
Patch failed at 0001 Bug 3150: Move emails for sending cart and list contents
to notices

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