https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27265 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #6 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. root@kohadevbox:koha(bz27265)$ git bz apply 27265 Bug 27265 - Process message queue cron should be able to take multiple types as a parameter 115430 - Bug 27265: Enable message queue cron to accept multiple codes and types Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 27265: Enable message queue cron to accept multiple codes and types Using index info to reconstruct a base tree... M C4/Letters.pm M misc/cronjobs/process_message_queue.pl Falling back to patching base and 3-way merge... Auto-merging misc/cronjobs/process_message_queue.pl Auto-merging C4/Letters.pm CONFLICT (content): Merge conflict in C4/Letters.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 27265: Enable message queue cron to accept multiple codes and types -- You are receiving this mail because: You are watching all bug changes.