[Koha-bugs] [Bug 21239] CSS regressions caused by SCSS move

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

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

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

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #9 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Applied bug 21234 and bug 21237, but this one conflicts on top:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 21239: CSS regressions caused by SCSS move
fatal: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.

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