http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8995
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #35 from Paola Rossi <[email protected]> --- I've tried to apply the patches aginst master 3.17.00.055 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 CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt deleted in HEAD and modified in Bug 8995: Show OpenURL links in OPAC search results. Version Bug 8995: Show OpenURL links in OPAC search results of koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt left in tree. CONFLICT (modify/delete): koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt deleted in HEAD and modified in Bug 8995: Show OpenURL links in OPAC search results. Version Bug 8995: Show OpenURL links in OPAC search results of koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt left in tree. Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac-old.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/XSLT.pm CONFLICT (content): Merge conflict in C4/XSLT.pm Auto-merging C4/Biblio.pm Failed to merge in the changes. Patch failed at 0001 Bug 8995: Show OpenURL links in OPAC search results So I pass the patch to "Patch doesn't apply" status. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
