[Koha-bugs] [Bug 16538] Improve the style of progress bars

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

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16538

Héctor Eduardo Castro Avalos <hector.hecaxmmx at gmail.com> changed:

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

--- Comment #3 from Héctor Eduardo Castro Avalos <hector.hecaxmmx at gmail.com> ---
Hi Owen

Applying: Bug 16538 - Improve the style of progress bars
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/tools/stage-marc-import.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css
Failed to merge in the changes.

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