2021-07-29 22:39:06 +02:00
2 changed files with 2 additions and 2 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1 @@
-assets/css/default.css merge=ours
+default.css merge=ours
--- a/asset/css/default.css
+++ b/asset/css/default.css
`@ -1 +1 @@`
	`assets/css/default.css merge=ours`	`default.css merge=ours`