https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11708 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #241 from Séverine Queune <severine.queune@bulac.fr> --- I tried to test bug 20810 but this dependency doesn't apply : Bug 11708 - Display all basketgroups on one page, and new column aqbasketgroups.closeddate 75003 - Bug 11708: Change aqbasketgroups.closed to closeddate 75004 - Bug 11708: New page for basket groups Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11708: Change aqbasketgroups.closed to closeddate Applying: Bug 11708: New page for basket groups Using index info to reconstruct a base tree... M acqui/basketgroup.pl M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: Koha/Acquisition/Basketgroup.pm Koha/Acquisition/Basketgroups.pm acqui/basketgroups.pl koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt Please move or remove them before you can merge. Aborting Also failed on Biblibre's sandbox #11 -- You are receiving this mail because: You are watching all bug changes.