try to make conflict

ValiantYuan · Sep 8, 2017 · f9c4e69 · f9c4e69
1 parent ef24099
commit f9c4e69
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/test.py b/test.py
@@ -1,5 +1,6 @@
 #-*- coding: utf-8 -*-
 #add this comment in test-git branch
+#add this to test conflict
 import time, threading
 
 def loop():