https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23352 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #21 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. Applying: Bug 23352: Default setting of item price, replacement price, ccode, dateaccesioned in serials-edit.pl Using index info to reconstruct a base tree... M C4/Items.pm M C4/Serials.pm M Koha/Schema/Result/Subscription.pm M installer/data/mysql/kohastructure.sql A installer/data/mysql/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref M koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt M koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt M serials/subscription-add.pl Falling back to patching base and 3-way merge... Auto-merging serials/subscription-add.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging Koha/Schema/Result/Subscription.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Subscription.pm Auto-merging C4/Serials.pm Auto-merging C4/Items.pm CONFLICT (content): Merge conflict in C4/Items.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 23352: Default setting of item price, replacement price, ccode, dateaccesioned in serials-edit.pl ... -- You are receiving this mail because: You are watching all bug changes.