diff --git a/src/test.txt b/src/test.txt
index ce9766b3..083dbf85 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-前端错误消息提示
+Merge branch 'V20221228' into zouap