css after merge with fix/button-sizes

2021-07-28 13:10:35 +02:00 · 2021-07-28 13:10:35 +02:00 · 42ae15c4c4
parent f4c2ec5074
commit 42ae15c4c4
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`