merge brach "1"

MaaXYZ · Jun 25, 2024 · 6c666e4 · 6c666e4
2 parents 2933a9e + 602ebb8
commit 6c666e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/assets/resource/base/pipeline/shopping.json b/assets/resource/base/pipeline/shopping.json
@@ -107,4 +107,4 @@
             "NoForFree"
         ]
     }
-}
+}
diff --git a/assets/resource/bilibili/pipeline/startup.json b/assets/resource/bilibili/pipeline/startup.json
@@ -4,4 +4,4 @@
         "action": "StartApp",
         "package": "com.megagame.crosscore.bilibili/com.megagame.crosscore.bilibili.GSCPlayerActivity"
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,4 +107,4 @@ @@
                 "NoForFree"
             ]
         }
-    }
+    }