diff --git a/vite.config.js b/vite.config.js
index 1ecee3d4..3d832a12 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,32 +12,7 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
-<<<<<<< HEAD
-      
            target: 'http://test.api.huitongys.com',
-=======
-          // target: 'http://192.168.10.126:8889',
-          // hy
-          // target: 'http://192.168.10.48:13000',
-          // lmy
-          // target: 'http://192.168.10.123:8889',
-          // target: 'http://192.168.10.101:8888',
-          // 老zyc
-          // target: 'http://192.168.10.75:8777',
-          // 新zyc
-          // target: 'http://192.168.6.116:8777',
-          target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.10.25:13000',
-          // target: 'http://192.168.10.57:13000',
-          // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.6.116:8777',
-          // tjj
-          // sst
-          // target: 'http://192.168.10.94:8888',
-          // target: 'http://192.168.10.29:13000',
-          // target: 'http://h5uapi.huitongys.com',
-          // target: 'http://test.api.huitongys.com',
->>>>>>> dev
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },