[Koha-bugs] [Bug 7308] new column in admin/aqbudgets

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7308

Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |bgkriegel at gmail.com

--- Comment #9 from Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> ---
Patch doesn't apply
Applying: Bug 7308: Show ordered amount in aqbudgets.pl
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/admin/aqbudgets.tt
Auto-merging admin/aqbudgets.pl
CONFLICT (content): Merge conflict in admin/aqbudgets.pl
Auto-merging C4/Budgets.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 7308: Show ordered amount in aqbudgets.pl

-- 
You are receiving this mail because:
You are watching all bug changes.