https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29060 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com --- Comment #2 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. Applying: Bug 29060: Use modal for suspending holds until a date from the holds page Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc M koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 29060: Use modal for suspending holds until a date from the holds page -- You are receiving this mail because: You are watching all bug changes.