fixed config

magpie-ea · Nov 11, 2024 · 8ebae5c · 8ebae5c
1 parent 52f43c8
commit 8ebae5c
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/vue.config.js b/vue.config.js
@@ -20,18 +20,9 @@ module.exports = {
     stylelint: {}
   },
   publicPath:
-<<<<<<< HEAD
-    process.env.NODE_ENV === 'production' && process.env.REPO_NAME
-      ? '/' +
-        process.env.REPO_NAME +
-        __dirname.substring(process.env.GITHUB_WORKSPACE.length)
-      : '/'
-=======
       process.env.NODE_ENV === 'production' && process.env.REPO_NAME
           ? '/' +
           process.env.REPO_NAME +
           __dirname.substring(process.env.GITHUB_WORKSPACE.length)
           : '/'
->>>>>>> 17ce0ffaa58122b8036adfa81941f66b191db841
 };
-