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

David Nind <[email protected]> changed:

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

--- Comment #29 from David Nind <[email protected]> ---
The patches no longer apply 8-(... When that is fixed, I think the status can
change to signed off.

git bz apply 30295

Bug 30295 - Send a notification when a recall is manually cancelled

172038 - Bug 30295: Send a notification when a recall is manually cancelled
172039 - Bug 30295: Use blessed patron to enqueue notice and QA fixes
172041 - Bug 30295: Add phone transport option

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 30295: Send a notification when a recall is manually cancelled
Using index info to reconstruct a base tree...
M       installer/data/mysql/en/mandatory/sample_notices.yml
M       installer/data/mysql/mandatory/sample_notices_message_transports.sql
Falling back to patching base and 3-way merge...
Auto-merging
installer/data/mysql/mandatory/sample_notices_message_transports.sql
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 30295: Send a notification when a recall is manually
cancelled

-- 
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/

Reply via email to