[Koha-bugs] [Bug 8995] Show OpenURL links in OPAC search results

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

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

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at univ-lyon3.fr

--- Comment #19 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
Some problems occurred applying patches from bug 8995:
<h1>Something went wrong !</h1>Applying: Bug 8995: Show OpenURL links in OPAC
search results Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Biblio.pm
Auto-merging C4/XSLT.pm
CONFLICT (content): Merge conflict in C4/XSLT.pm Auto-merging
installer/data/mysql/sysprefs.sql Auto-merging
installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging koha-tmpl/opac-tmpl/prog/en/css/opac.css
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
Auto-merging koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
Auto-merging opac/opac-detail.pl
CONFLICT (content): Merge conflict in opac/opac-detail.pl Auto-merging
opac/opac-search.pl Failed to merge in the changes.
Patch failed at 0001 Bug 8995: Show OpenURL links in OPAC search results When
you have

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