合并无关历史并解决冲突

2025-05-09 11:03:21 +08:00
parent f7c4785e92 78d4053a4b
commit 49d15ad182
78 changed files with 3751 additions and 1 deletions
--- a/AppScope/resources/base/element/string.json
+++ b/AppScope/resources/base/element/string.json
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
  "string": [
    {
@@ -6,3 +7,13 @@
    }
  ]
 }
+=======
+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "MyApplication"
+    }
+  ]
+}
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4