mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-05-10 00:01:17 +08:00
merge alas
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
import {createApp} from 'vue';
|
||||
import App from '/@/App.vue';
|
||||
import router from '/@/router';
|
||||
<<<<<<< HEAD
|
||||
import {setupI18n} from '/@/locales/setupI18n';
|
||||
import {setupThemeSetting} from '/@/settings/themeSetting';
|
||||
import {setupStore} from '/@/store';
|
||||
@@ -32,9 +31,3 @@ async function bootstrap() {
|
||||
}
|
||||
|
||||
await bootstrap();
|
||||
=======
|
||||
|
||||
createApp(App)
|
||||
.use(router)
|
||||
.mount('#app');
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
Reference in New Issue
Block a user