[Koha-bugs] [Bug 11578] Improvement of the funds list view

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #20 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
I am sorry, but there are a lot of conflicts in aqbudgets.tt:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11578: Upgrade the treetable jquery plugin
Applying: Bug 11578: Improve the funds list view
/home/katrin/kohaclone/.git/rebase-apply/patch:465: trailing whitespace.
    [% ELSIF ( budget.remaining_neg ) %] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M    C4/Budgets.pm
M    admin/aqbudgets.pl
M    koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
<stdin>:465: trailing whitespace.
    [% ELSIF ( budget.remaining_neg ) %] 
warning: 1 line applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
Auto-merging admin/aqbudgets.pl
Auto-merging C4/Budgets.pm
Failed to merge in the changes.

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