aaaa

chaojidage · Sep 23, 2018 · deca662 · deca662
1 parent 59bd9ee
commit deca662
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/日记 b/日记
@@ -1,7 +1,2 @@
 栗子不好吃
 今天我学习了枫林宝宝的git 
-<<<<<<< HEAD
-haiyoushui？
-=======
-aaaa
->>>>>>> 3b9ec5a272fedbf70385ebe36388d7810ca2d786