添加boxjs订阅，配合boxjs设置B站首页屏蔽UP主 (#312)

添加boxjs订阅，配合boxjs设置B站首页屏蔽UP主

rule/Shadowrocket/Advertising/Advertising_Resolve.list

@@ -1,6 +1,17 @@
 # NAME: Advertising
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:37
+# DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用
+# DOMAIN-KEYWORD: 59
+# DOMAIN-SUFFIX: 44846
+# DOMAIN: 20750
+# IP-CIDR: 247
+# IP-CIDR6: 1
+# URL-REGEX: 302
+# TOTAL: 66205
+=======
 # UPDATED: 2021-04-19 02:19:17
 # DESCRIPTION: 分流规则中含有URL-REGEX类型，请搭配MITM使用
 # DOMAIN-KEYWORD: 59
@@ -10,6 +21,7 @@
 # IP-CIDR6: 1
 # URL-REGEX: 302
 # TOTAL: 65731
+>>>>>>> upstream/master
 DOMAIN-KEYWORD,adashx
 DOMAIN-KEYWORD,admarvel
 DOMAIN-KEYWORD,admaster