From 859143bd3a4e534d133a74b7cebf99515e2e909e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B8=A2=E4=BD=8E=E5=90=B8?= <tdc@sudo.host>
Date: Fri, 19 Mar 2021 14:51:50 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20git=20typo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 filter.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/filter.txt b/filter.txt
index fa944b9..0f01fc9 100644
--- a/filter.txt
+++ b/filter.txt
@@ -1,10 +1,6 @@
 [Adblock Plus]
 ! Title: FutaFilter
-<<<<<<< HEAD
 ! Version: 2021.0319.01
-=======
-! Version: 2021.0310.01
->>>>>>> 839a9a9492c9a04cc386786d880af91fb0acc079
 ! Expires: 1 hour
 ! Homepage: https://t.me/adguard_tw
 ! ----------------------------------------------------------------------
@@ -132,4 +128,4 @@ coffeehunter.tw##div[class^="fancybox-wrap"]
 ||bilanx.dcard.tw/*/events
 
 ! PTT 相關
-||pttbrain.herokuapp.com/api/ptt/metric/user-geo-distributions^$document
\ No newline at end of file
+||pttbrain.herokuapp.com/api/ptt/metric/user-geo-distributions^$document