[Koha-bugs] [Bug 19474] Convert staff client CSS to SCSS

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

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

--- Comment #25 from Kyle M Hall <kyle at bywatersolutions.com> ---
(In reply to Jonathan Druart from comment #24)
> .gitignore is not tracked yet, so I get:
> 
> error: The following untracked working tree files would be overwritten by
> merge:
>         .gitignore
> Please move or remove them before you merge.

Sounds like you added your own .gitignore file. Just remove it and everything
should apply just fine. You could add a followup to merge the two versions if
what you have in yours would be generally useful.

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