http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9828
Nick Clemens <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #9 from Nick Clemens <[email protected]> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 9828: <h1>Something went wrong !</h1>Applying: Bug 9828: More specific indexing of UNIMARC 6XX fields Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Search.pm Auto-merging etc/zebradb/biblios/etc/bib1.att Auto-merging etc/zebradb/ccl.properties Auto-merging etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml CONFLICT (content): Merge conflict in etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml Auto-merging etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl CONFLICT (content): Merge conflict in etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl Auto-merging etc/zebradb/marc_defs/unimarc/biblios/record.abs Failed to merge in the changes. Patch failed at 0001 Bug 9828: More specific indexing of UNIMARC 6XX fields When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 9828 - Zebra indexes useless subfields in UNIMARC 6XX -- 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/
