[Koha-bugs] [Bug 20398] Add a system preference to disable search result highlighting in the staff interface

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20398

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #25 from David Nind <david at davidnind.com> ---
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

-- 
You are receiving this mail because:
You are watching all bug changes.