Closed ajrdesign closed 6 years ago
As said in Slack, this is an autogenerated file, can't resolve this conflict. Instead, merge from the newest develop, then generate the file (overwriting whatever is there before, even if conflict), then commit.
mmm... I guess here were some other css changes when everything got pulled together. No matter i've merged it and recompiled the css file.
Small optimizations to lessen the amount it time it takes to render.