From 3193abf376ccfd26baf880812e94c8fb2236a399 Mon Sep 17 00:00:00 2001
From: Collin Barrett <collinbarrett@users.noreply.github.com>
Date: Mon, 3 Sep 2018 08:11:43 -0500
Subject: [PATCH] add Fanboy's problematic-sites

closes #417
---
 data/FilterList.json           | 21 ++++++++++++++++++++-
 data/FilterListMaintainer.json |  4 ++++
 data/FilterListTag.json        |  4 ++++
 data/Merge.json                | 12 ++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/data/FilterList.json b/data/FilterList.json
index 8b2d385ae..377338928 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -10334,5 +10334,24 @@
     "submissionUrl": null,
     "syntaxId": 4,
     "viewUrl": "https://github.com/andromedarabbit/List-KR/raw/master/filter.txt"
+  },
+  {
+    "id": 564,
+    "chatUrl": null,
+    "description": "Stop Anti-adblock tracking and problematic Anti-adblock websites",
+    "descriptionSourceUrl": "https://fanboy.co.nz/",
+    "discontinuedDate": null,
+    "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW",
+    "emailAddress": null,
+    "forumUrl": null,
+    "homeUrl": "https://www.fanboy.co.nz/",
+    "issuesUrl": "https://github.com/ryanbr/fanboy-adblock/issues",
+    "licenseId": 16,
+    "name": "Fanboy's problematic-sites",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 3,
+    "viewUrl": "https://secure.fanboy.co.nz/fanboy-problematic-sites.txt"
   }
-]
+]
\ No newline at end of file
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index fee0159d5..425a4a0d7 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -59,6 +59,10 @@
     "filterListId": 14,
     "maintainerId": 13
   },
+  {
+    "filterListId": 564,
+    "maintainerId": 14
+  },
   {
     "filterListId": 15,
     "maintainerId": 18
diff --git a/data/FilterListTag.json b/data/FilterListTag.json
index 8f033c795..4d7112a06 100644
--- a/data/FilterListTag.json
+++ b/data/FilterListTag.json
@@ -526,5 +526,9 @@
   {
     "filterListId": 561,
     "tagId": 3
+  },
+  {
+    "filterListId": 564,
+    "tagId": 5
   }
 ]
\ No newline at end of file
diff --git a/data/Merge.json b/data/Merge.json
index 57a2f1735..2d07b9dde 100644
--- a/data/Merge.json
+++ b/data/Merge.json
@@ -115,6 +115,18 @@
     "mergeFilterListId": 168,
     "upstreamFilterListId": 301
   },
+  {
+    "mergeFilterListId": 255,
+    "upstreamFilterListId": 564
+  },
+  {
+    "mergeFilterListId": 265,
+    "upstreamFilterListId": 564
+  },
+  {
+    "mergeFilterListId": 266,
+    "upstreamFilterListId": 564
+  },
   {
     "mergeFilterListId": 271,
     "upstreamFilterListId": 338