diff --git a/src/test.txt b/src/test.txt
index 9c825fd0..61415c4a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改#2702
+Merge remote-tracking branch 'origin/res-manage' into res-manage