fix: merge conflict

This commit is contained in:
Yidadaa
2023-04-27 01:18:09 +08:00
7 changed files with 61 additions and 34 deletions

View File

@@ -101,6 +101,7 @@ body {
justify-content: center;
align-items: center;
user-select: none;
touch-action: pan-x pan-y;
font-family: "Noto Sans SC", "SF Pro SC", "SF Pro Text", "SF Pro Icons",
"PingFang SC", "Helvetica Neue", "Helvetica", "Arial", sans-serif;