1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-23 05:08:01 +08:00

merge alas

This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions

View File

@@ -11,13 +11,10 @@
"parser": "@typescript-eslint/parser",
"ecmaVersion": 12,
"sourceType": "module"
<<<<<<< HEAD
},
"rules": {
/** These rules are disabled because they are incompatible with prettier */
"vue/html-self-closing": "off",
"vue/singleline-html-element-content-newline": "off"
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
}
}