resolve merge conflict

yfx

2026-03-13 5414134d9358f675d0dd74587646afc065a949a9

1
2
3
4
5
6
7
8
9
10
11
12
13
14
{
    "version" : "1.0",
    "configurations" : [
        {
            "customPlaygroundType" : "local",
            "playground" : "custom",
            "type" : "uni-app:app-android"
        },
        {
            "playground" : "standard",
            "type" : "uni-app:app-ios"
        }
    ]
}