合并bug

vue.config.js

@@ -1,9 +1,4 @@
 const path = require('path');
-<<<<<<< HEAD
-// const proxy_path = 'http://192.168.2.236:80';
-=======
-// const proxy_path = 'http://192.168.2.236:5050';
->>>>>>> DZBLFAPZEDIT
 const proxy_path = 'http://192.168.2.241:88';
 // const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';