From c34cf8bc5863933e7d6ee3a3559184bdb40823d7 Mon Sep 17 00:00:00 2001 From: dusicong Date: Wed, 17 Mar 2021 12:21:25 +0800 Subject: [PATCH] fixed conflicts --- jero-web/src/main.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/jero-web/src/main.js b/jero-web/src/main.js index 6d2cfb61..dedf0134 100644 --- a/jero-web/src/main.js +++ b/jero-web/src/main.js @@ -13,14 +13,7 @@ import { require('@/components/onlineForm/onlineForm') require('@/components/onlineForm/OnlineForm.css') -<<<<<<< HEAD - -import Antd, { - version -} from 'ant-design-vue' -======= import Antd, { version } from 'ant-design-vue' ->>>>>>> 7b6717bf9f54a33c42756caf45c0648b88365786 console.log('ant-design-vue version:', version) import Viser from 'viser-vue'