fix conflict

This commit is contained in:
halo 2021-12-28 18:43:29 +08:00
commit 61325cad20

View File

@ -3,3 +3,4 @@
"singleQuote": false,
"tabWidth": 2
}