From 09655a34efc563b9fbfc4e00914ab57076e217dc Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 14 Mar 2023 17:52:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20220908' 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 dc7b544f..c041a237 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '资源管理二期' (#2874) from res-manage-v2 into V20220908
+Merge remote-tracking branch 'origin/V20220908' into res-manage-v2