mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-04-07 22:51:46 +08:00
merge alas
This commit is contained in:
@@ -9,13 +9,7 @@ module.exports = {
|
||||
root: './packages/renderer',
|
||||
tsconfig: './tsconfig.json',
|
||||
snippetFolder: './.vscode/vetur/snippets',
|
||||
<<<<<<< HEAD
|
||||
globalComponents: ['./src/components/**/*.vue'],
|
||||
=======
|
||||
globalComponents: [
|
||||
'./src/components/**/*.vue',
|
||||
],
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
},
|
||||
{
|
||||
root: './packages/main',
|
||||
|
||||
Reference in New Issue
Block a user