http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7620 Francois Charbonnier <francois.charbonnier@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |francois.charbonnier@biblib | |re.com --- Comment #7 from Francois Charbonnier <francois.charbonnier@biblibre.com> --- The patch does not apply : OPACNoResults, add keyword to search string Apply? [yn] y Applying: OPACNoResult, Add keyword to query string Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Auto-merging opac/opac-search.pl CONFLICT (content): Merge conflict in opac/opac-search.pl Failed to merge in the changes. Patch failed at 0001 OPACNoResult, Add keyword to query string When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/OPACNoResults-add-keyword-to-search-string-cfak79.patch -- You are receiving this mail because: You are watching all bug changes.