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

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

rule/QuantumultX/Advertising/Advertising.list

@@ -1,6 +1,15 @@
 # NAME: Advertising
 # AUTHOR: blackmatrix7
 # REPO: https://github.com/blackmatrix7/ios_rule_script
+<<<<<<< HEAD
+# UPDATED: 2021-04-18 02:19:35
+# HOST-KEYWORD: 59
+# HOST-SUFFIX: 44846
+# HOST: 20750
+# IP-CIDR: 247
+# IP6-CIDR: 1
+# TOTAL: 65903
+=======
 # UPDATED: 2021-04-19 02:19:15
 # HOST-KEYWORD: 59
 # HOST-SUFFIX: 44389
@@ -8,6 +17,7 @@
 # IP-CIDR: 247
 # IP6-CIDR: 1
 # TOTAL: 65429
+>>>>>>> upstream/master
 HOST,0.nextyourcontent.com,Advertising
 HOST,0.up.qingdaonews.com,Advertising
 HOST,0001.2waky.com,Advertising

rule/QuantumultX/Advertising/README.md

@@ -13,15 +13,24 @@
 
 ## 规则统计
 
+<<<<<<< HEAD
+总计规则：65903 条。
+=======
 总计规则：65429 条。
+>>>>>>> upstream/master
 
 各类型规则统计：
 
 | 类型 | 数量(条) |
 | ---- | ---- |
 | HOST-KEYWORD | 59 |
+<<<<<<< HEAD
+| HOST-SUFFIX | 44846 |
+| HOST | 20750 |
+=======
 | HOST-SUFFIX | 44389 |
 | HOST | 20733 |
+>>>>>>> upstream/master
 | IP-CIDR | 247 |
 | IP6-CIDR | 1 |
 ## 配置说明