From d34f187983bd4209d02862ed357c75de515846c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?SharwOrange=E6=A9=99=E5=A4=9C?= <kuliangcha@qq.com>
Date: Sun, 31 Dec 2023 01:27:48 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20requirement.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 requirement.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/requirement.txt b/requirement.txt
index 2a79a74..c41e920 100644
--- a/requirement.txt
+++ b/requirement.txt
@@ -3,9 +3,5 @@ colorama
 qtoml
 pynacl
 python-socketio[asyncio_client]
-<<<<<<< HEAD
-mcstatus
-=======
 mcstatus
 requests
->>>>>>> 51011ec401ee07fe7446b24fad680a629e12ff56