diff --git a/src/test.txt b/src/test.txt
index d872eb04..d04aaae7 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-ide样式调整
+Merge branch 'ide_1130' into ide