From 67eebb1ea2d2f69464011b8f85fc38e5beab2c3a Mon Sep 17 00:00:00 2001
From: Collin Barrett <collinbarrett@users.noreply.github.com>
Date: Sat, 30 Jun 2018 14:23:49 -0500
Subject: [PATCH] cleanup for #304 and #305 conflicts

---
 data/FilterListMaintainer.json | 4 ++--
 data/Maintainer.json           | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index eb6aba7fc..6080a3817 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -285,7 +285,7 @@
   },
   {
     "filterListId": 342,
-    "maintainerId": 63
+    "maintainerId": 70
   },
   {
     "filterListId": 343,
@@ -293,7 +293,7 @@
   },
   {
     "filterListId": 344,
-    "maintainerId": 63
+    "maintainerId": 70
   },
   {
     "filterListId": 345,
diff --git a/data/Maintainer.json b/data/Maintainer.json
index 60f689aef..40507d3a4 100644
--- a/data/Maintainer.json
+++ b/data/Maintainer.json
@@ -473,6 +473,11 @@
     "emailAddress": null,
     "homeUrl": "https://github.com/notracking",
     "name": "notracking",
+    "twitterHandle": null
+  },
+  {
+    "id": 70,
+    "emailAddress": null,
     "homeUrl": "https://github.com/KonoromiHimaries",
     "name": "KonoromiHimaries",
     "twitterHandle": null