[Koha-bugs] [Bug 7169] Change booksellers search results display

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

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

jmbroust <jean-manuel.broust at univ-lyon2.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Failed QA
                 CC|                            |jean-manuel.broust at univ-lyo
                   |                            |n2.fr

--- Comment #12 from jmbroust <jean-manuel.broust at univ-lyon2.fr> ---
Applying: Bug 7169: Change booksellers search results display
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging acqui/booksellers.pl
CONFLICT (content): Merge conflict in acqui/booksellers.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Failed to merge in the changes.
Patch failed at 0001 Bug 7169: Change booksellers search results display

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