1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-18 04:31:30 +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

@@ -1,5 +1,4 @@
{
<<<<<<< HEAD
"compilerOptions": {
"module": "esnext",
"target": "esnext",
@@ -20,33 +19,15 @@
},
"lib": ["ESNext", "dom", "dom.iterable"]
},
=======
"extends": "../../tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"/@/*": [
"./src/*"
]
},
"lib": ["ESNext", "dom", "dom.iterable"]
},
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"include": [
"src/**/*.vue",
"src/**/*.ts",
"src/**/*.tsx",
"types/**/*.d.ts",
"../../types/**/*.d.ts",
<<<<<<< HEAD
"../../../types/**/*.d.ts",
"./components.d.ts"
],
"exclude": ["**/*.spec.ts", "**/*.test.ts"],
"typeRoots": ["../../node_modules/@types/", "./types", "../../../types"]
=======
"../preload/types/electron-api.d.ts"
]
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
}