From a1bd45dc494440ac5c703477d1d0b50b9822e3d5 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 15 Feb 2020 11:17:26 -0600 Subject: [PATCH] Revert "merge upstream data" This reverts commit 901309bccf9512511db7f36393b8d924e998692e. --- data/FilterList.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 6e74ee397..887c4e926 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -1,7 +1,7 @@ [ { "id": 1, - "description": "A filter list that blocks mobile advertisements and trackers on Japanese properties", + "description": "CONFLICT2 A filter list that blocks mobile advertisements and trackers on Japanese properties", "homeUrl": "https://280blocker.net", "licenseId": 1, "name": "280 Blocker", @@ -12,7 +12,7 @@ }, { "id": 2, - "description": "TEMP (REMOVE ME) Mute is an AdBlock Plus filter for user comments. In the same way that AdBlock hides ads, AdBlock can use this filter to hide user-generated comments, allowing you to browse the Internet with less stupidity clawing at your eyeballs.", + "description": "Mute is an AdBlock Plus filter for user comments. In the same way that AdBlock hides ads, AdBlock can use this filter to hide user-generated comments, allowing you to browse the Internet with less stupidity clawing at your eyeballs.", "descriptionSourceUrl": "https://github.com/B-Con/mute", "homeUrl": "https://github.com/B-Con/mute", "issuesUrl": "https://github.com/B-Con/mute/issues",