hywen
/
YNUtdPlatform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突合并

This commit is contained in:
BianLzhaoMin 2024-11-07 08:49:20 +08:00
parent b4ec9297e9
commit 3a52601293
1 changed files with 249 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifest.json
View File

@ -89,7 +89,6 @@
"geolocation": { "geolocation": {
"system": { "system": {
"__platform__": ["ios", "android"] "__platform__": ["ios", "android"]
<<<<<<< HEAD
}, },
"baidu": { "baidu": {
"__platform__": ["android"], "__platform__": ["android"],
@ -99,13 +98,6 @@
}, },
"maps": { "maps": {
"baidu": { "baidu": {
=======
}
},
"maps" : {
"amap" : {
"name" : "",
>>>>>>> dev-sy-10-10
"appkey_ios": "", "appkey_ios": "",
"appkey_android": "" "appkey_android": ""
} }