解决合并遗留问题

src/main.js

@@ -92,26 +92,6 @@ let options = {
 Vue.use(options);
 // 打印设计结束
 
-<<<<<<< HEAD
-// 打印设计开始
-import Antd from 'ant-design-vue';
-import 'ant-design-vue/dist/antd.css';
-Vue.use(Antd);
-
-import {hiPrintPlugin} from './index'
-Vue.use(hiPrintPlugin)
-hiPrintPlugin.disAutoConnect();
-
-// import Storage from 'vue-ls'
-let options = {
-  namespace: 'hiPrint-',
-  name: 'ls',
-  // storage: 'local',
-};
-// Vue.use(Storage, options);
-Vue.use(options);
-// 打印设计结束
-
 import VueDND from 'awe-dnd'
  
 Vue.use(VueDND)