summaryrefslogtreecommitdiff
path: root/AyaBot/plugins/covid19.py
diff options
context:
space:
mode:
Diffstat (limited to 'AyaBot/plugins/covid19.py')
-rw-r--r--AyaBot/plugins/covid19.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/AyaBot/plugins/covid19.py b/AyaBot/plugins/covid19.py
index 9917396..eee53de 100644
--- a/AyaBot/plugins/covid19.py
+++ b/AyaBot/plugins/covid19.py
@@ -1,11 +1,6 @@
# -*- coding:utf-8 -*-
import re
import json
-<<<<<<< HEAD
-=======
-import sys
-sys.path.append(r'请改成你机器人的对应目录\Aya\AyaBot\plugins\Module')
->>>>>>> af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2
import demjson
import requests
from os import path