From 4cae7b89b60956e6c23e4c6e7a9e5a7b76927c53 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 16 十一月 2021 14:02:05 +0800
Subject: [PATCH] 解决冲突

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

diff --git a/src/pages/areaManage/index/main.ts b/src/pages/areaManage/index/main.ts
index 72eb673..788d84b 100644
--- a/src/pages/areaManage/index/main.ts
+++ b/src/pages/areaManage/index/main.ts
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import App from './App.vue'
+import App from './App.vue';
 
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';

--
Gitblit v1.8.0