http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6832 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz Patch Status|Needs Signoff |Does not apply --- Comment #3 from Chris Cormack <chris@bigballofwax.co.nz> 2011-12-19 07:04:38 UTC --- 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/neworderempty.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Failed to merge in the changes. Patch failed at 0001 Patch for bug 6832 to fix the ajax validation of exceed budget in new orders, reworked for 3.6. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.