generated from Seekra/repository-template
chore: resolve merge conflicts
This commit is contained in:
+1
-1
@@ -18,7 +18,7 @@ import { createApp } from 'vue'
|
|||||||
import { createPinia } from 'pinia';
|
import { createPinia } from 'pinia';
|
||||||
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
|
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
|
||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
import { i18n, loadLanguage } from './i18n';
|
import { i18n, loadLanguage, fallbackLocale } from './i18n';
|
||||||
import getCurrentLanguage from './utils/currentLanguage';
|
import getCurrentLanguage from './utils/currentLanguage';
|
||||||
import router from './router'
|
import router from './router'
|
||||||
import './styles/common.css'
|
import './styles/common.css'
|
||||||
|
|||||||
Reference in New Issue
Block a user