Merge branch '实验一'

2 years ago · 8bad2413c1
parent f2a1f73363 7c43d80dad
commit 8bad2413c1
1 changed files with 2 additions and 0 deletions
--- a/a.md
+++ b/a.md
@ -9,3 +9,5 @@ AAAA
 我要在产生一次冲突


+我要以实验一的身份来进行修改
+我要用分支来进行二次修改