Roy-Mao
diff --git a/Diff for: ‎.DS_Store
0 Bytes b/Diff for: ‎.DS_Store
0 Bytes
diff --git a/Diff for: ‎花名册.txt
+1 b/Diff for: ‎花名册.txt
+1
@@ -261,3 +261,4 @@ bollen_Chak	本地修改，我和楼上是同一个人，已解决conflict
 sufei           小菜一碟
 ns              学生
 Grace           留学生
+nazi		Developer