[Koha-bugs] [Bug 23787] Add AUTO_RENEWALS in sample_notices.sql

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |david at davidnind.com

--- Comment #9 from David Nind <david at davidnind.com> ---
Patch doesn't apply:

Applying: Bug 23787: Add AUTO_RENEWALS in sample_notices.sql
Using index info to reconstruct a base tree...
A       installer/data/mysql/en/mandatory/sample_notices.sql
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): installer/data/mysql/en/mandatory/sample_notices.sql
deleted in HEAD and modified in Bug 23787: Add AUTO_RENEWALS in
sample_notices.sql. Version Bug 23787: Add AUTO_RENEWALS in sample_notices.sql
of installer/data/mysql/en/mandatory/sample_notices.sql left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23787: Add AUTO_RENEWALS in sample_notices.sql

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