363

Tower-KevinLi · Mar 8, 2015 · b37491c · mating0815 · May 19, 2016 · b37491c
2 parents 934bda1 + fe9cee0
commit b37491c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/花名册.txt b/花名册.txt
@@ -327,6 +327,7 @@ kjdh            抠脚大汉
 qqxufo          111111111
 Justin          student
 terrel          solution marketing
+<<<<<<< HEAD
 zhangbohun      叫我序员就就好了
 wood            产品设计
 wudkj           未毕业程序猿一只
@@ -342,6 +343,10 @@ HahahaVector    新手_客户端
 Tony            PM初学
 kalechao        交互设计师
 cool            摸一摸code
+=======
+DarlingLi       国软国软牛逼闪闪
+=======
+>>>>>>> fe9cee0b7bb34734c6e8b39e544365b1098e5ff1
 waleson         abc-test
 Tadayima        有强迫症的码农++
 xiao            初学者