http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14304
Nick Clemens <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #2 from Nick Clemens <[email protected]> --- Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl Auto-merging koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl Failed to merge in the changes. -- 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/
