[Koha-bugs] [Bug 7186] add new 'Koha Stats' tab to 'About' page

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Version|rel_3_8                     |master
       Patch Status|Needs Signoff               |Does not apply

--- Comment #8 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-12-21 07:40:04 UTC ---
There is some controversial disscussion about this bug. 
Patch does currently not apply to master:

Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 7186 - add new 'Koha Stats' tab to 'About' page
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/about.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 7186 - add new 'Koha Stats' tab to 'About' page
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.