https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29578
--- Comment #25 from Andreas Roussos <[email protected]> --- (In reply to Stephanie Etallaz from comment #23) > CONFLICT (rename/rename): Rename > "koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.highlight-3.js"- > >"koha-tmpl/opac-tmpl/lib/jquery/plugins/jquery.highlight-3.js" in branch > "HEAD" rename > "koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.highlight-3.js"- > >"koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.highlight-5.js" in > "Bug 29578: Upgrade the jQuery highlighter plugin" Thank you for your interest in this bug report, Stephanie. The patch has been rebased against the current master, please try again ;-) -- 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/
