冲突

951bb779 · LiuJunYi · dc19c311 · 951bb779
Commit 951bb779 authored Dec 13, 2018 by LiuJunYi
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

utils/Config.js
+2 -4

No files found.
--- a/utils/Config.js
+++ b/utils/Config.js
@@ -5,11 +5,9 @@
 // }

 export const Config = {
-<<<<<<< HEAD
+
  apiPath: "http://local.picp.io/api/",
-=======
-  apiPath: "http://local.picp.io//api/",
->>>>>>> 2ebbca1059aec42084726e53501cfcf564b7c5ac
+
  mobPath: "https://mavaler.jqhulian.com/mob/",
  shopJoinPath: "https://mavaler.jqhulian.com/mob/Index/shopjoin"
 }