[Koha-bugs] [Bug 10937] Option to hide and group itemtypes from advanced search

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

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

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

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

--- Comment #42 from Marc Véron <veron at veron.ch> ---
Sorry, merge conflicts (again) with current master (3.19.00.002):

Applying: Bug 10947 - Grouped ItemTypes - Patch should apply properly on latest
master.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-search.pl
CONFLICT (content): Merge conflict in opac/opac-search.pl
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Failed to merge in the changes.

Oh, the patch title reads:
Bug 10947 - Grouped ItemTypes - Patch should apply properly on latest master. 

...but we are on Bug 10937?

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