diff --git a/src/store/index.js b/src/store/index.js
index 146bf8aa..cce3faef 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -50,21 +50,13 @@ export default new Vuex.Store({
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
     // FILEURL:'http://182.90.224.237:51234/image/',
-<<<<<<< .mine
     UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
     FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
-=======
-    // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
-    // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
->>>>>>> .theirs
     // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//坤工作流地址(本地)
-<<<<<<< .mine
     WORKFLOWURL: 'http://192.168.34.126:88/#/workspace/forms',//罗峰工作流地址(本地)
 
-=======
     // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
     // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
->>>>>>> .theirs
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
     // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试