From 51463b71f3512df5da04367f6f83399a2bfeef98 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 14 Mar 2023 17:52:00 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=8C=E6=9C=9F'=20(#2874)=20from=20res-ma?=
 =?UTF-8?q?nage-v2=20into=20V20220908?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test.txt b/src/test.txt
index 88273102..dc7b544f 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220908' into point-v2
+Merge pull request '资源管理二期' (#2874) from res-manage-v2 into V20220908