From bf07a35149f406fdb3c2d4fae5a43a82aee3dc89 Mon Sep 17 00:00:00 2001
From: XIU2 <54703944+XIU2@users.noreply.github.com>
Date: Mon, 20 Jul 2020 11:37:44 +0800
Subject: [PATCH] Add files via upload

---
 README-ZH.md | 4 ----
 README.md    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/README-ZH.md b/README-ZH.md
index 2e1133c9..980c583c 100644
--- a/README-ZH.md
+++ b/README-ZH.md
@@ -54,11 +54,7 @@
  ***https://trackerslist.com/best.txt***  
 * **完整列表：**(301 个)  
  ***https://trackerslist.com/all.txt***  
-<<<<<<< HEAD
-* **HTTP(S)列表：**(94 个)  
-=======
 * **HTTP(S)列表：**(100 个)  
->>>>>>> 0fbfb8ab60382178a7f15b54ce8dfaf3cebe61fe
  ***https://trackerslist.com/http.txt***  
 
 ****
diff --git a/README.md b/README.md
index f5c65804..e1dc52bb 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,7 @@ The more people use Tracker, the faster the BT download speed, **so please recom
  ***https://trackerslist.com/best.txt***  
 * **ALL Tracker list:** (301 trackers)  
  ***https://trackerslist.com/all.txt***  
-<<<<<<< HEAD
-* **HTTP(S) Tracker list:** (94 trackers)  
-=======
 * **HTTP(S) Tracker list:** (100 trackers)  
->>>>>>> 0fbfb8ab60382178a7f15b54ce8dfaf3cebe61fe
  ***https://trackerslist.com/http.txt***  
 
 ****