24 lines
500 B
Plaintext
24 lines
500 B
Plaintext
<<<<<<< HEAD
|
|
{
|
|
"app": {
|
|
"bundleName": "com.example.myapplication",
|
|
"vendor": "example",
|
|
"versionCode": 1000000,
|
|
"versionName": "1.0.0",
|
|
"icon": "$media:layered_image",
|
|
"label": "$string:app_name"
|
|
}
|
|
}
|
|
=======
|
|
{
|
|
"app": {
|
|
"bundleName": "com.example.myapplication",
|
|
"vendor": "example",
|
|
"versionCode": 1000000,
|
|
"versionName": "1.0.0",
|
|
"icon": "$media:layered_image",
|
|
"label": "$string:app_name"
|
|
}
|
|
}
|
|
>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
|