From 74b17c49b5dad43a6b1e94433ea7ef351120fec9 Mon Sep 17 00:00:00 2001
From: SengokuCola <1026294844@qq.com>
Date: Wed, 26 Feb 2025 19:26:51 +0800
Subject: [PATCH] Update README.md

---
 README.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1cc3035f0..30b52e006 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,6 @@
 麦麦 qq机器人
 
 
-
-
-<<<<<<< Updated upstream
 还在整理中
 =======
 *还没整理完*
@@ -18,7 +15,5 @@
 
 主要代码在/src/plugins/chat下
 
->>>>>>> Stashed changes
 
-
-纯编程外行，很多代码史一样多多包涵
\ No newline at end of file
+纯编程外行，很多代码史一样多多包涵