忽略其他开发端源码修改，先以本机版本为基础，再另行调整。

2026-08-14 05:27:10 +08:00 · 2026-07-21 11:33:37 +08:00
parent da529c737b b1be995092
commit 3a8d509f4e
1 changed files with 10 additions and 0 deletions
@@ -1,4 +1,5 @@
 #Created by .winboll/winboll_app_build.gradle
+<<<<<<< HEAD
 #Tue Jul 21 11:13:12 CST 2026
 stageCount=12
 libraryProject=
@@ -6,3 +7,12 @@ baseVersion=15.21
 publishVersion=15.20.11
 buildCount=22
 baseBetaVersion=15.20.12
+=======
+#Tue Jul 21 02:54:31 GMT 2026
+stageCount=0
+libraryProject=
+baseVersion=15.21
+publishVersion=15.21.0
+buildCount=1
+baseBetaVersion=15.21.1
+>>>>>>> origin/contacts