http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8643
Owen Leonard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #6 from Owen Leonard <[email protected]> --- Applying: Bug 8643 /home/oleonard/kohaclone/.git/rebase-apply/patch:388: trailing whitespace. <p> Tab:[% subfield.tab %] | $[% subfield.tagsubfield %] warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... <stdin>:388: trailing whitespace. <p> Tab:[% subfield.tab %] | $[% subfield.tagsubfield %] warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging cataloguing/addbiblio.pl Auto-merging admin/marctagstructure.pl CONFLICT (content): Merge conflict in admin/marctagstructure.pl Auto-merging admin/marc_subfields_structure.pl Auto-merging C4/Biblio.pm Failed to merge in the changes. Patch failed at 0001 Bug 8643 -- 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/
