361

Weiqiang-Li · Mar 8, 2015 · 089f363 · 089f363
2 parents d66d12b + ed7f0da
commit 089f363
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/花名册.txt b/花名册.txt
@@ -415,6 +415,7 @@ Roy             CAN
 >>>>>>> 65ea3edcb5cf9c3f4a9961c34c82b9e1bb55df42
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> bed950f413174f7d2dcb26ad03b0ff7c5a80de2e
 =======
 subvertion        什么都懂点什么都不精通的在校码农
@@ -445,3 +446,6 @@ rimiHS          程序员
 rimiXK		程序员
 tony            学生
 >>>>>>> a1f914afbe298c730a3fe87ca8ea8e879aec1633
+=======
+RossLing        hello,everyone!
+>>>>>>> ed7f0da72d84fd525286eebaff8acb1b84d13b50