http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11438
Paola Rossi <paola.ro...@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #7 from Paola Rossi <paola.ro...@cineca.it> --- Against master 3.17.00.001 the patch needs to be rebased: Applying: Bug 11438 - Add creation date and closing date to basketgroups Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging acqui/basketgroup.pl Auto-merging C4/Acquisition.pm Failed to merge in the changes. Patch failed at 0001 Bug 11438 - Add creation date and closing date to basketgroups So I pass the patch to "Patch doesn't apply" status. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/