diff --git a/vuex_demo1/test.txt b/vuex_demo1/test.txt
index 908bb81..5ba6579 100644
--- a/vuex_demo1/test.txt
+++ b/vuex_demo1/test.txt
@@ -1 +1,2 @@
 测试远程dev分支
+测试合并