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

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

diff --git a/src/test.txt b/src/test.txt
index e7bb6761..61415c4a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix issue
+Merge remote-tracking branch 'origin/res-manage' into res-manage