diff options
Diffstat (limited to 'AyaBot/plugins/weather.py')
| -rw-r--r-- | AyaBot/plugins/weather.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/AyaBot/plugins/weather.py b/AyaBot/plugins/weather.py index 414b55c..69daa71 100644 --- a/AyaBot/plugins/weather.py +++ b/AyaBot/plugins/weather.py @@ -1,11 +1,6 @@ # -*- coding:utf-8 -*- import os import re -<<<<<<< HEAD -======= -import sys -sys.path.append(r'请改成你机器人的对应目录\Aya\AyaBot\plugins\Module') ->>>>>>> af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2 import json import requests from os import path @@ -220,4 +215,4 @@ async def _(session: CommandSession): if not stripped_arg: session.pause('要查询的城市不能为空，请重新输入') - session.state[session.current_key] = stripped_arg + session.state[session.current_key] = stripped_arg
\ No newline at end of file |