[Koha-bugs] [Bug 11297] Add support for custom PQF attributes for Z39.50 server searches.

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11297

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

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

--- Comment #27 from Marc Véron <veron at veron.ch> ---
Sorry, patch does not apply:
Applying: Bug 11297 - Add support for custom PQF attributes for Z39.50 server
searches.
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/z3950servers.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Breeding.pm
Failed to merge in the changes.

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