http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7166 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |koha@univ-lyon3.fr --- Comment #14 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- Something went wrong ! Applying: Bug 7166: Adds edit order notes when the basket is closed Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging acqui/neworderempty.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Failed to merge in the changes. Patch failed at 0001 Bug 7166: Adds edit order notes when the basket is closed -- You are receiving this mail because: You are watching all bug changes.