https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11708 Aleisha Amohia <aleishaamohia@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aleishaamohia@hotmail.com Status|Needs Signoff |Patch doesn't apply --- Comment #153 from Aleisha Amohia <aleishaamohia@hotmail.com> --- Patch does not apply Applying: Bug 11708: Add aqbasketgroups.closeddate Applying: Bug 11708: Unit tests for aqbasketgroups.closeddate Applying: Bug 11708: basketgroup.pl can now display basketgroups for all suppliers Using index info to reconstruct a base tree... M acqui/basketgroup.pl M koha-tmpl/intranet-tmpl/prog/css/datatables.css M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt Falling back to patching base and 3-way merge... 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 -- You are receiving this mail because: You are watching all bug changes.