http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12168 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |paola.rossi@cineca.it --- Comment #4 from Paola Rossi <paola.rossi@cineca.it> --- I test against master 3.15.00.051. Applying: Bug 12168: Spent and ordered budget values are wrong if deep > 2 Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Budgets.pm CONFLICT (content): Merge conflict in C4/Budgets.pm Failed to merge in the changes. Patch failed at 0001 Bug 12168: Spent and ordered budget values are wrong if deep > 2 So I pass the patch to "Patch doesn't apply" status. -- You are receiving this mail because: You are watching all bug changes.