https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28833
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #28 from David Nind <[email protected]> --- The patch no longer applies for me 8-(... git bz apply 28833 Bug 28833 - Speed up holds queue builder via parallel processing 167349 - Bug 28833: Speed up holds queue builder via parallel processing Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 28833: Speed up holds queue builder via parallel processing Using index info to reconstruct a base tree... M C4/HoldsQueue.pm M debian/templates/koha-conf-site.xml.in M etc/koha-conf.xml M misc/cronjobs/holds/build_holds_queue.pl Falling back to patching base and 3-way merge... Auto-merging misc/cronjobs/holds/build_holds_queue.pl CONFLICT (content): Merge conflict in misc/cronjobs/holds/build_holds_queue.pl Auto-merging etc/koha-conf.xml Auto-merging debian/templates/koha-conf-site.xml.in Auto-merging C4/HoldsQueue.pm CONFLICT (content): Merge conflict in C4/HoldsQueue.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 28833: Speed up holds queue builder via parallel processing -- 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/
