https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14803
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #62 from David Nind <[email protected]> --- Patch no longer applies 8-( Applying: Bug 14803: Reload checkouts table on renewal Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/js/checkouts.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/checkouts.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/checkouts.js error: Failed to merge in the changes. Patch failed at 0001 Bug 14803: Reload checkouts table on renewal The copy of the patch that failed is found in: .git/rebase-apply/patch Testing notes: - Was going to use the steps in the description of the issue to a) replicate the issue b) apply the patch c) see if that fixes the issue -- 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/
