解决合并冲突

dev分支更变
删除 dev.txt 和 test.txt 文件
2 changed files with 1 additions and 1 deletions
--- a/dev.txt
+++ b/dev.txt
@ -0,0 +1 @@
 dev分支
--- a/test.txt
+++ b/test.txt
@ -1 +0,0 @@
 1
Author	SHA1	Message	Date
陈志嘉	7ec565796d	解决合并冲突	2 months ago
陈志嘉	23da8c8d06	dev分支更变	2 months ago
陈志嘉	4737756c96	删除 dev.txt 和 test.txt 文件	2 months ago
陈志嘉	b1bcc17835	dev分支更变	2 months ago
陈志嘉	69503c8f47	dev分支更变	2 months ago
陈志嘉	56039b63bb	dev分支更变	2 months ago
陈志嘉	37d6ca7c2c	dev分支更变	2 months ago