From bbc8b11ab7a4a497be44b851fb7219eb5b67a096 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 14 Mar 2023 17:52:16 +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 8384bf45..61415c4a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-删除逻辑
+Merge remote-tracking branch 'origin/res-manage' into res-manage