From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突

---
 src/main.ts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 5635729..18ef496 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -21,6 +21,6 @@
 directive(app);
 other.elSvg(app);
 
-app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t, locale: zhCn}).use(i18n).use(VueGridLayout).mount('#app');
+app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t, locale: zhCn }).use(i18n).use(VueGridLayout).mount('#app');
 
 app.config.globalProperties.mittBus = mitt();

--
Gitblit v1.9.2