From d2686c492f9ea95848f770726a2151217f841c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=92=E9=85=92=E7=9A=84=E6=9D=8E=E7=99=BD?=
 <670939375@qq.com>
Date: Tue, 10 Sep 2024 10:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/README.md b/README.md
index e2d8a35..f1ea3c8 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,4 @@
 # Weibo_PublicOpinion_AnalysisSystem
 一个前后端完备、使用了机器学习算法的微博舆情分析系统
 
-<<<<<<< HEAD
 **关键词**：深度学习、网络爬虫、前后端开发、NLP、transformers、Flask
-=======
-**关键词**：深度学习、网络爬虫、前后端开发、NLP、transformers、Bert、Flask
-
-你可以扫描下方的二维码看到该项目的详细直观的介绍☺️
-
-![](https://lovexl-oss.oss-cn-beijing.aliyuncs.com/bed/202407052004351.png)
-
-下面是部分页面展示：
-
-![](https://lovexl-oss.oss-cn-beijing.aliyuncs.com/bed/202407062005150.png)
-
-![](https://lovexl-oss.oss-cn-beijing.aliyuncs.com/bed/202407062005644.png)
-
-![](https://lovexl-oss.oss-cn-beijing.aliyuncs.com/bed/202407062005188.png)
-
-![](https://lovexl-oss.oss-cn-beijing.aliyuncs.com/bed/202407062006366.png)
-
-![](https://lovexl-oss.oss-cn-beijing.aliyuncs.com/bed/202407062006204.png)
->>>>>>> e87ed422b06f4252b056baea1f52f1aec7dff7ad