Comment # 5 from Chris Cormack

Falling back to patching base and 3-way merge...
Auto-merging C4/Biblio.pm
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
Failed to merge in the changes.