From ff901ef6ea7628e0a3bcfabc0753d8b6d569eaeb Mon Sep 17 00:00:00 2001
From: tntest <tntest@gmail.com>
Date: Wed, 8 Jun 2022 10:07:34 +0800
Subject: [PATCH] test branch modify

---
 vuex_demo1/test.txt | 1 +
 1 file changed, 1 insertion(+)

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分支
+测试合并