test(#1) up as CN

DebugUself · Feb 19, 2018 · 238193e · 238193e
1 parent a3e052d
commit 238193e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/LeoDocs_ZQ.leo b/LeoDocs_ZQ.leo
@@ -2285,7 +2285,11 @@ http://leoeditor.com/tutorial.html
 
 任何疑问到这来交流:
 http://groups.google.com/group/leo-editor
-</t>
+
+
+
+#1 检验.
+成员在相同 node 中的可 merge 冲突?</t>
 <t tx="ekr.20051202072010"></t>
 <t tx="ekr.20060211140947.1">try:
     theId = os.getenv('USER')