[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 #43 from David Nind <david at davidnind.com> ---
I was too slow on this one as well... the patch no longer applies 8-(..

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
M       installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
M       installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
A       installer/data/mysql/it-IT/necessari/notices.sql
M       installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
A       installer/data/mysql/pl-PL/mandatory/sample_notices.sql
A       installer/data/mysql/ru-RU/mandatory/sample_notices.sql
A       installer/data/mysql/uk-UA/mandatory/sample_notices.sql
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete):
installer/data/mysql/uk-UA/mandatory/sample_notices.sql deleted in HEAD and
modified in Bug 3150: Move emails for sending cart and list contents to
notices. Version Bug 3150: Move emails for sending cart and list contents to
notices of installer/data/mysql/uk-UA/mandatory/sample_notices.sql left in
tree.
CONFLICT (modify/delete):
installer/data/mysql/ru-RU/mandatory/sample_notices.sql deleted in HEAD and
modified in Bug 3150: Move emails for sending cart and list contents to
notices. Version Bug 3150: Move emails for sending cart and list contents to
notices of installer/data/mysql/ru-RU/mandatory/sample_notices.sql left in
tree.
CONFLICT (modify/delete):
installer/data/mysql/pl-PL/mandatory/sample_notices.sql deleted in HEAD and
modified in Bug 3150: Move emails for sending cart and list contents to
notices. Version Bug 3150: Move emails for sending cart and list contents to
notices of installer/data/mysql/pl-PL/mandatory/sample_notices.sql left in
tree.
Auto-merging installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
CONFLICT (modify/delete): installer/data/mysql/it-IT/necessari/notices.sql
deleted in HEAD and modified in Bug 3150: Move emails for sending cart and list
contents to notices. Version Bug 3150: Move emails for sending cart and list
contents to notices of installer/data/mysql/it-IT/necessari/notices.sql left in
tree.
Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
Auto-merging installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
Auto-merging 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.