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