合并冲突

vite.config.ts

@@ -77,11 +77,7 @@ export default defineConfig({
         // target: "https://test.lexiaoya.cn",
         // target: "https://kt.colexiu.com",
         target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
-<<<<<<< HEAD
         // target: "https://test.kt.colexiu.com",
-=======
-        //target: "https://test.kt.colexiu.com",
->>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
         // target: "https://mec.colexiu.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),