https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20398 --- Comment #28 from Thibaud Guillot <thibaud.guillot@biblibre.com> --- (In reply to David Nind from comment #25)
Patch no longer applies 8-(... things move too fast sometimes!
Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20398 : Added a syspref to highlight or not highlight search terms in results on the staff interface Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/js/pages/results.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/pages/results.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/pages/results.js error: Failed to merge in the changes. Patch failed at 0001 Bug 20398 : Added a syspref to highlight or not highlight search terms in results on the staff interface
Normally I solved the conflict, thanks to you -- You are receiving this mail because: You are watching all bug changes.