更新 requirement.txt

2023-12-31 01:27:48 +00:00 · 2023-12-31 01:27:48 +00:00 · d34f187983
commit d34f187983
parent 7b61a958f9
1 changed files with 0 additions and 4 deletions
--- a/requirement.txt
+++ b/requirement.txt
@ -3,9 +3,5 @@ colorama
 qtoml
 pynacl
 python-socketio[asyncio_client]
-<<<<<<< HEAD
-mcstatus
-=======
 mcstatus
 requests
->>>>>>> 51011ec401ee07fe7446b24fad680a629e12ff56