diff --git a/src/test.txt b/src/test.txt
index 8f1a9ad6..eeaba850 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改全局排序规则
+Merge branch 'zouap' of https
\ No newline at end of file