https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18784
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #14 from David Nind <[email protected]> --- The patch no longer applies: git bz apply 18784 Bug 18784 - Add 'auto claim' option to subscription batch edit tool 155465 - Bug 18784: Add 'auto claim' option to subscription batch edit tool 155466 - Bug 18784: (QA follow-up) Tidy code block Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 18784: Add 'auto claim' option to subscription batch edit tool Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt M serials/subscription-batchedit.pl Falling back to patching base and 3-way merge... Auto-merging serials/subscription-batchedit.pl CONFLICT (content): Merge conflict in serials/subscription-batchedit.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 18784: Add 'auto claim' option to subscription batch edit tool -- 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/
