From b040c48275205925ac142391028975f380af231f Mon Sep 17 00:00:00 2001
From: sxiaoaa <sxiaoaa@MacBook-Pro.local>
Date: Sat, 6 Jul 2019 09:04:43 +0800
Subject: [PATCH] Update rewrite.txt

---
 rewrite.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rewrite.txt b/rewrite.txt
index 3bcd42b..ccc887c 100644
--- a/rewrite.txt
+++ b/rewrite.txt
@@ -39,10 +39,9 @@ https?://www\.zhihu\.com/question/ url request-header (\r\n)User-Agent:.+(\r\n)
 #twitter to tweetbot
 ^https:\/\/twitter\.com\/ url 302 tweetbot://
 
-=======
 #tweetbot
 ^https:\/\/twitter\.com\/ url 307 tweetbot:// 
->>>>>>> 588cf1e8428e092eb0818e1a2440ed0661084b37
+
 #github master branch
 ^https://github.com/(Dreamacro|yichengchen|lhie1|ccg2018|SukkaW)/(clash|clashX|Rules|ClashA|Koolshare-Clash)$ url 302 https://github.com/$1/$2/tree/master