合并无关历史并解决冲突

2025-05-09 11:03:21 +08:00
parent f7c4785e92 78d4053a4b
commit 49d15ad182
78 changed files with 3751 additions and 1 deletions
--- a/AppScope/app.json5
+++ b/AppScope/app.json5
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
  "app": {
    "bundleName": "com.example.myapplication",
@@ -8,3 +9,15 @@
    "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