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:
jorge 2021-07-28 13:05:51 +02:00
parent 592bf8cb10
commit b21780c1cb
1 changed files with 1 additions and 0 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
assets/css/default.css merge=ours