diff options
author | Kyomotoi <[email protected]> | 2020-06-21 00:30:38 +0800 |
---|---|---|
committer | Kyomotoi <[email protected]> | 2020-06-21 00:30:38 +0800 |
commit | d320ea0800c02f6d67dbbd645d49d690021b1440 (patch) | |
tree | 41495a9b75bdf89d5cf898a0b9ce6619e75b943d /AyaBot/plugins/covid19.py | |
parent | 7d129eb9e9cca5d0a06f7e699b425306fb8ce2f6 (diff) | |
parent | af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2 (diff) | |
download | ATRI-d320ea0800c02f6d67dbbd645d49d690021b1440.tar.gz ATRI-d320ea0800c02f6d67dbbd645d49d690021b1440.tar.bz2 ATRI-d320ea0800c02f6d67dbbd645d49d690021b1440.zip |
Merge branch 'master' of https://github.com/Kyomotoi/Aya
Diffstat (limited to 'AyaBot/plugins/covid19.py')
-rw-r--r-- | AyaBot/plugins/covid19.py | 5 |
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 |