From 7b3859284dee7cb00636a08b1177f692a6b6323f Mon Sep 17 00:00:00 2001
From: yhj <1836460075@qq.com>
Date: 星期五, 19 十二月 2025 15:40:01 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/XM_GK_QD

---
 夏蒙注塑报工/manifest.json |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git "a/\345\244\217\350\222\231\346\263\250\345\241\221\346\212\245\345\267\245/manifest.json" "b/\345\244\217\350\222\231\346\263\250\345\241\221\346\212\245\345\267\245/manifest.json"
index 9291d5d..96f154b 100644
--- "a/\345\244\217\350\222\231\346\263\250\345\241\221\346\212\245\345\267\245/manifest.json"
+++ "b/\345\244\217\350\222\231\346\263\250\345\241\221\346\212\245\345\267\245/manifest.json"
@@ -2,7 +2,11 @@
     "name" : "澶忚挋娉ㄥ鎶ュ伐",
     "appid" : "__UNI__CE37242",
     "description" : "",
+<<<<<<< HEAD
     "versionName" : "1.2.2",
+=======
+    "versionName" : "1.2.1",
+>>>>>>> 28997825e47018a0d9b3b8e4c003b232f62d241f
     "versionCode" : 101,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */

--
Gitblit v1.9.3