351

rookie1989 · Mar 8, 2015 · f0280a2 · f0280a2
2 parents 7d5f935 + 9c93397
commit f0280a2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/花名册.txt b/花名册.txt
@@ -14,7 +14,12 @@ qqxufo          1111111111
 请在下面加上你的昵称和Title，或者联系方式什么都行，注意一人一行哦：
 
 >>>>>>> e824d3be97f7019cc3f0bec8b35d35ad84209bdf
+<<<<<<< HEAD
 nsynet          师计设
+=======
+
+zhangbohun      叫我序员就就好了
+>>>>>>> 9c93397f188f1c7ff6011b0a8a3705012f0149ca
 qqxufo          111111111
 >>>>>>> 189fe3ad138b61196f115fac32b168b0153f0cad
 KevinLi         Tower设计师  微博： @李凯文-KevinLi