https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20741 Claire Gravely <claire_gravely@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |claire_gravely@hotmail.com --- Comment #2 from Claire Gravely <claire_gravely@hotmail.com> --- Patch does not apply Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt Falling back to patching base and 3-way merge... 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/localization.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.