From cf29bec987c486aefd6a746574dfad59fdc20277 Mon Sep 17 00:00:00 2001 From: Chunxiang Date: Tue, 14 Mar 2023 17:40:14 +0800 Subject: [PATCH] Merge branch 'V20220125.patch.1' into computing --- src/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test.txt b/src/test.txt index 268e36be..83debf38 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge pull request 'V20220125.patch.1合入develop' (#1467) from V20220125.patch.1 into develop +Merge branch 'V20220125.patch.1' into computing