http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3850 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz --- Comment #9 from Chris Cormack <chris@bigballofwax.co.nz> 2010-11-15 02:21:41 UTC --- Pushed to new/enh/bug_3850 I had a conflict when applying this patch in the file koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl At around line 109 <<<<<<< HEAD <!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" --> =======

...

...

...

...

...

> More comprehensive fixes for Bug 3850 - Budget Planning Pages Need Design Work

I resolved it to keep the include, but that may have been the wrong move, please take a look at this branch and tell me if that was right. -- 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.