From 9b3de9ec4980c4b4acc8093a6e86dc14bc73292b Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 21 七月 2022 17:48:10 +0800
Subject: [PATCH] second commit
---
src/plugins/element.js | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/plugins/element.js b/src/plugins/element.js
index 5e79cdb..bcf8fab 100644
--- a/src/plugins/element.js
+++ b/src/plugins/element.js
@@ -12,19 +12,12 @@
MenuItem,
Message, Option, Pagination,
Row, Select,
-<<<<<<< HEAD
- Submenu, Table, TableColumn, Upload,
-=======
Submenu, Table, TableColumn, Upload
->>>>>>> 561b46d42e9a1b633f0428911045898b8270dfa2
} from 'element-ui'
Vue.use(Button).use(Container).use(Header).use(Aside).use(Menu).use(Submenu).use(MenuItem).use(Main).use(Icon).use(Card)
.use(Col).use(Row).use(Card).use(Table).use(TableColumn).use(Form).use(FormItem).use(Input).use(Select).use(Option)
-<<<<<<< HEAD
- .use(Pagination).use(Dialog).use(Upload).use(DatePicker)
-=======
+
.use(Pagination).use(Dialog).use(Upload).use(DatePicker).use(Image)
->>>>>>> 561b46d42e9a1b633f0428911045898b8270dfa2
Vue.prototype.$message = Message
--
Gitblit v1.8.0