[Koha-bugs] [Bug 9744] Add a column Fund name on the home page of acquisitions

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

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

jmbroust <jean-manuel.broust at univ-lyon2.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jean-manuel.broust at univ-lyo
                   |                            |n2.fr

--- Comment #4 from jmbroust <jean-manuel.broust at univ-lyon2.fr> ---
I tried to test this patch with sandbox system, it does not work, here is the
result : 

Applying: Bug 9744Add a column "Fund name" the the acquisition home.
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/css/staff-global.css
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 9744Add a column "Fund name" the the acquisition home.

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