From a18ba8eab0d9a2d9b1af511a122b036b656688be Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Sat, 6 Jul 2019 08:49:55 +0800
Subject: [PATCH] Update rewrite.txt

---
 rewrite.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rewrite.txt b/rewrite.txt
index f995115..5cf2dbc 100644
--- a/rewrite.txt
+++ b/rewrite.txt
@@ -524,7 +524,6 @@ https?://www\.zhihu\.com/question/ url request-header (\r\n)User-Agent:.+(\r\n)
 ^https?:\/\/api\.zhuishushenqi\.com\/notification\/shelfMessage url reject
 ^https?:\/\/api\.zhuishushenqi\.com\/user\/bookshelf-updated url reject
 ^https?:\/\/itunes\.apple\.com\/lookup\?id=575826903 url reject
-<<<<<<< HEAD
 
 # 招行 app
 ^https:\/\/m\.creditcard\.ecitic\.com\/citiccard\/mbk\/.+.\/appStartAdv url reject