From 1cf7e06ada01da922203a5cc05663884c832f16f Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 16 Feb 2020 17:02:27 -0600 Subject: [PATCH 1/3] TEMP (REVERT ME) test conflict in migrate --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 500557d7f..1f0685696 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": "THIS IS TEMP (REVERT ME) A filter list that blocks mobile advertisements and trackers on Japanese properties", "homeUrl": "https://280blocker.net", "licenseId": 1, "name": "280 Blocker", From b304b87b5265f5877d8cc260fbb31bbc25f5cafc Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 16 Feb 2020 17:05:25 -0600 Subject: [PATCH 2/3] Revert "TEMP (REVERT ME) test conflict in migrate" This reverts commit 1cf7e06ada01da922203a5cc05663884c832f16f. --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 1f0685696..500557d7f 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -1,7 +1,7 @@ [ { "id": 1, - "description": "THIS IS TEMP (REVERT ME) 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", From 02a4897f11a387544bcea540df16bb9d0c766084 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 16 Feb 2020 17:05:57 -0600 Subject: [PATCH 3/3] TEMP (REVERT ME) test upstream sync --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 500557d7f..253e68e85 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -23,7 +23,7 @@ }, { "id": 3, - "description": "Hosts file to block advertisements and trackers designed for Android", + "description": "THIS IS TEMP (REVERT ME) Hosts file to block advertisements and trackers designed for Android", "forumUrl": "https://forum.xda-developers.com/showthread.php?t=1916098", "homeUrl": "https://forum.xda-developers.com/showthread.php?t=1916098", "licenseId": 3,