From a204c25dc56ba551e01a98be4d63fcb3e4e913c6 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 14 Mar 2023 17:52:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20220830' into
 res-manage-v2

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index 846a245e..1565f000 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'res-manage' into res-manage-v2
+Merge remote-tracking branch 'origin/V20220830' into res-manage-v2