FIX:emoji_robot

hexueyuan · Apr 15, 2019 · bbe279d · bbe279d
2 parents db84113 + 56d8434
commit bbe279d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/example/emoji_robot/emoji_robot.py b/example/emoji_robot/emoji_robot.py
@@ -18,7 +18,11 @@
 except ImportError:
     import http.cookiejar as cookielib
 
+<<<<<<< HEAD:example/emoji_robot/emoji_robot.py
 sys.path.append('../../src')
+=======
+sys.path.append('../src')
+>>>>>>> 56d84344ab1359d059bccefd5417b1c5647b2b30:example/emoji_robot.py
 
 from chatbot import Chatbot, context
 
@@ -36,7 +40,7 @@
         "path": "./chat_robot.log",
         "name": "chat_robot",
         "format": "%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-        "level": "INFO"
+        "level": "DEBUG"
     }
 }