diff --git a/src/test.txt b/src/test.txt
index 41d834ec..9c19e5fc 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-图片解析webpack
+Merge remote-tracking branch 'origin/portrait' into portrait