配置冲突

93bdd3cf · hiyon · 1b1e8f51 · 93bdd3cf
Commit 93bdd3cf authored Feb 22, 2024 by hiyon
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

vue.config.js vue.config.js +0 -5

No files found.
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,12 +35,7 @@ module.exports = {
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-<<<<<<< HEAD
-        target: 'http://localhost:8080',
-        // target: `http://192.168.66.110:8080`,
-=======
        target: `http://localhost:8080`,
->>>>>>> 942458841bc29ffa1f2476ae9edc1d3cfea974e2
        // target: `http://192.168.4.122:8080`,
        changeOrigin: true,
        pathRewrite: {