new3

new2
2 changed files with 3 additions and 3 deletions
--- a/doc/new.txt
+++ b/doc/new.txt
--- a/冲突.txt
+++ b/冲突.txt
@ -1,3 +1,3 @@
-11111
-22222
-lihaoyi
+111111
+222222
+main
Author	SHA1	Message	Date
李昊亿	22dfd5a403	new3	1 year ago
李昊亿	d802f4435a	new2	1 year ago