mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-18 03:21:29 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -11,10 +11,13 @@
|
||||
"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
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user