删除冗余

Merge remote-tracking branch 'remotes/origin/br001'
# Conflicts: # mm.txt
1 changed files with 3 additions and 1 deletions
--- a/mm.txt
+++ b/mm.txt
@ -1,3 +1,5 @@
 Wo is 001
+Wo is 002
 Wo is 0011
-Wo is bran02
+Wo is branch001
+
Author	SHA1	Message	Date
sun386	00367c70f7	删除冗余	3 years ago
sun386	57041a50c3	Merge remote-tracking branch 'remotes/origin/br001' # Conflicts: # mm.txt	3 years ago
sun386	ab316d129a	002	3 years ago
sun386	8c0f74f659	br001	3 years ago
sun386	0851f98955	0001	3 years ago