From 47d06919aa1524905cb68fcab67f5b8968e5d0d1 Mon Sep 17 00:00:00 2001
From: Peng-YM <1048217874pengym@gmail.com>
Date: Mon, 31 Aug 2020 02:19:04 +0800
Subject: [PATCH] Update Surge.sgmodule

---
 config/Surge.sgmodule | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/Surge.sgmodule b/config/Surge.sgmodule
index 0a3c364..4aa259a 100644
--- a/config/Surge.sgmodule
+++ b/config/Surge.sgmodule
@@ -4,8 +4,5 @@
 hostname=sub.store
 
 [Script]
-<<<<<<< HEAD
 Sub-Store = type=http-request,pattern=^https?:\/\/sub\.store,script-path=sub-store.js,requires-body=true,timeout=120
-=======
-Sub-Store = type=http-request,pattern=^https?:\/\/sub\.com,script-path=sub-store.js,requires-body=true,timeout=120
->>>>>>> master
+