Revert "add conflict with master data"

This reverts commit f8b263e359.
This commit is contained in:
Collin M. Barrett 2020-02-15 11:17:46 -06:00
parent 297a11fd34
commit f936396fed

View file

@ -1,7 +1,7 @@
[
{
"id": 1,
"description": "CONFLICT A filter list that blocks mobile advertisements and trackers on Japanese properties",
"description": "A filter list that blocks mobile advertisements and trackers on Japanese properties",
"homeUrl": "https://280blocker.net",
"licenseId": 1,
"name": "280 Blocker",