fmerge

config/config.js

@@ -479,11 +479,7 @@ export default {
 
   proxy: {
     '/api/': {
-<<<<<<< HEAD
-      target: 'http://192.168.0.11:8080/',
-=======
       target: 'http://192.168.0.172:8080/',
->>>>>>> 5f3c214db5ee93d6bb88af4038dd9cec7d528a43
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },