fixed conflicts

2021-03-17 12:21:25 +08:00
parent 2b712341fe
commit c34cf8bc58
1 changed files with 0 additions and 7 deletions
@@ -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'