From eb0b2972f837ef45f7f30101018c26406b5b22ce Mon Sep 17 00:00:00 2001 From: Chunxiang Date: Tue, 14 Mar 2023 17:40:51 +0800 Subject: [PATCH] Merge branch 'zouap' of https --- src/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test.txt b/src/test.txt index 53cd04cb..eeaba850 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge pull request 'V20211213.patch合入develop' (#1020) from V20211213.patch into develop +Merge branch 'zouap' of https \ No newline at end of file