https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11708 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #267 from Séverine Queune <severine.queune@bulac.fr> --- Sorry Julian for the lack of reaction... CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc Auto-merging acqui/basketgroup.pl CONFLICT (content): Merge conflict in acqui/basketgroup.pl Auto-merging acqui/basket.pl Auto-merging Koha/Acquisition/Basket.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 11708: New page for basket groups -- You are receiving this mail because: You are watching all bug changes.