added a git merge rule to avoid default.css to be over written from other branches, instead it has to be created usin npm/gulp
This commit is contained in:
parent
592bf8cb10
commit
b21780c1cb
|
@ -0,0 +1 @@
|
|||
assets/css/default.css merge=ours
|
Loading…
Reference in New Issue