http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8643 Nick Clemens <nick@quecheelibrary.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nick@quecheelibrary.org Status|Needs Signoff |Patch doesn't apply --- Comment #8 from Nick Clemens <nick@quecheelibrary.org> --- Applying: Bug 8643 - Add important constraint to marc subfields Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging cataloguing/addbiblio.pl Auto-merging 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 - Add important constraint to marc subfields -- You are receiving this mail because: You are watching all bug changes.