冲突合并

2024-11-07 08:49:20 +08:00 · 2024-11-07 08:49:20 +08:00 · 3a52601293
parent b4ec9297e9
commit 3a52601293
1 changed files with 249 additions and 257 deletions
--- a/manifest.json
+++ b/manifest.json
@ -89,7 +89,6 @@
        "geolocation": {
          "system": {
            "__platform__": ["ios", "android"]
-<<<<<<< HEAD
          },
          "baidu": {
            "__platform__": ["android"],
@ -99,13 +98,6 @@
        },
        "maps": {
          "baidu": {
-=======
-                    }
-                },
-                "maps" : {
-                    "amap" : {
-                        "name" : "",
->>>>>>> dev-sy-10-10
            "appkey_ios": "",
            "appkey_android": ""
          }