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

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

diff --git a/rewrite.txt b/rewrite.txt
index 5cf2dbc..3bcd42b 100644
--- a/rewrite.txt
+++ b/rewrite.txt
@@ -36,7 +36,6 @@ https?://www\.zhihu\.com/question/ url request-header (\r\n)User-Agent:.+(\r\n)
 ^https?:\/\/(api|mapi)\.weibo\.(cn|com)\/2(\/groups\/timeline|\/statuses\/unread|\/statuses\/extend|\/comments\/build_comments|\/photo\/recommend_list|\/stories\/video_stream|\/statuses\/positives\/get|\/stories\/home_list|\/profile\/statuses|\/statuses\/friends\/timeline|\/service\/picfeed) url script-response-body https://raw.githubusercontent.com/yichahucha/surge/master/wb_ad.js
 ^https?:\/\/(sdk|wb)app\.uve\.weibo\.com(\/interface\/sdk\/sdkad.php|\/wbapplua\/wbpullad.lua) url script-response-body https://raw.githubusercontent.com/yichahucha/surge/master/wb_launch.js
 
-<<<<<<< HEAD
 #twitter to tweetbot
 ^https:\/\/twitter\.com\/ url 302 tweetbot://