From 4ca6f7c3712a17b08ac8b5e6310311954d576e9d Mon Sep 17 00:00:00 2001 From: Fisher Date: Tue, 14 Mar 2023 17:41:35 +0800 Subject: [PATCH] Merge branch 'develop' into V20210731.patch --- src/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test.txt b/src/test.txt index f80b8b89..a8f1107a 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge pull request '将补丁分支的代码合入develop' (#232) from V20210731.patch into develop +Merge branch 'develop' into V20210731.patch