From a5baeac084dad692d86f5fdc6ab206ac801f4ed8 Mon Sep 17 00:00:00 2001
From: aixiao <aixiao@aixiao.me>
Date: Tue, 9 Aug 2022 15:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index 7e8dda5..729c4bb 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,7 @@ ssh防止暴力破解,适用Debian 8、9、11 Centos 7
 支持第三方QQ邮箱告警  
 支持一次运行检测、后台运行检测  
 Debian系统请安装libcurl库和libiptc库  
-<<<<<<< HEAD
 Centos 7系统请安装libcurl库和iptables-devel库，yum install iptables-devel libcurl-devel
-=======
-Centos 7系统请安装libcurl库和iptables-devel库，yum install iptables-devel libcurl-devel  
->>>>>>> 708af46 (优化)
 
 
 ```