[Koha-bugs] [Bug 12296] OPAC search box should be customisable

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12296

Marc Véron <veron at veron.ch> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |veron at veron.ch

--- Comment #10 from Marc Véron <veron at veron.ch> ---
Does not apply:

Applying: Bug 12296 - make search box customisable with OpacCustomSearch
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 installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Failed to merge in the changes.

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