1 files changed, 1 insertions, 6 deletions
diff --git a/AyaBot/plugins/translate.py b/AyaBot/plugins/translate.py
index 3cb396b..6bbb707 100644
--- a/AyaBot/plugins/translate.py
+++ b/AyaBot/plugins/translate.py
@@ -1,10 +1,5 @@
 # -*- coding:utf-8 -*-
 import re
-<<<<<<< HEAD
-=======
-import sys
-sys.path.append(r'请改成你机器人的对应目录\Aya\AyaBot\plugins\Module')
->>>>>>> af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2
 import demjson
 import requests
 from os import path
@@ -46,4 +41,4 @@ async def _(session: CommandSession):
         msg=session.ctx['raw_message'][5:]
         re_msg = google_translate.translate(msg[:4999], to='en', source='zh-CN')
         if re_msg[0]!='':
-            await session.send(re_msg[0])
+            await session.send(re_msg[0])
+\ No newline at end of file