KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
dusicong
2021-03-17 12:21:25 +08:00
parent 2b712341fe
commit c34cf8bc58
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/main.js
-7
View File
@@ -13,14 +13,7 @@ import {
require('@/components/onlineForm/onlineForm') require('@/components/onlineForm/onlineForm')
require('@/components/onlineForm/OnlineForm.css') require('@/components/onlineForm/OnlineForm.css')
<<<<<<< HEAD
import Antd, {
version
} from 'ant-design-vue'
=======
import Antd, { version } from 'ant-design-vue' import Antd, { version } from 'ant-design-vue'
>>>>>>> 7b6717bf9f54a33c42756caf45c0648b88365786
console.log('ant-design-vue version:', version) console.log('ant-design-vue version:', version)
import Viser from 'viser-vue' import Viser from 'viser-vue'