[Koha-bugs] [Bug 10320] Show results from library's OverDrive collection in OPAC search

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

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

Owen Leonard <oleonard at myacpl.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #15 from Owen Leonard <oleonard at myacpl.org> ---
The first patch has a typical updatedatabase conflict.

The second fails with this error:

fatal: sha1 information is lacking or useless (C4/External/OverDrive.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Followup for bug 10320: minor bugfixes and style
improvements

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