diff --git a/src/test.txt b/src/test.txt
index b26fb1ef..1aa7eac8 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-add caneditfile
+Merge branch 'fix-497' of git.openi.org.cn
\ No newline at end of file