From c9336c2639410ad6b86f2fdb50070b89186869a5 Mon Sep 17 00:00:00 2001 From: Chunxiang Date: Tue, 14 Mar 2023 17:38:27 +0800 Subject: [PATCH] Merge branch 'V20220718' into zouap --- src/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test.txt b/src/test.txt index 8cbc05aa..c355903f 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge branch 'zouap_static' into zouap +Merge branch 'V20220718' into zouap