http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8995 Holger Meißner <h.meissner.82@web.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |h.meissner.82@web.de --- Comment #14 from Holger Meißner <h.meissner.82@web.de> --- 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 opac/opac-search.pl Auto-merging opac/opac-detail.pl Auto-merging koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl Auto-merging koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt Auto-merging koha-tmpl/opac-tmpl/prog/en/css/opac.css 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 installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/sysprefs.sql Auto-merging C4/Biblio.pm Failed to merge in the changes. Patch failed at 0001 Bug 8995: Show OpenURL links in OPAC search results -- You are receiving this mail because: You are watching all bug changes.