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