cleanup for #304 and #305 conflicts

This commit is contained in:
Collin M. Barrett 2018-06-30 14:23:49 -05:00
parent 9f8ecf5702
commit e013f5e7bd
2 changed files with 7 additions and 2 deletions

View file

@ -285,7 +285,7 @@
},
{
"filterListId": 342,
"maintainerId": 63
"maintainerId": 70
},
{
"filterListId": 343,
@ -293,7 +293,7 @@
},
{
"filterListId": 344,
"maintainerId": 63
"maintainerId": 70
},
{
"filterListId": 345,

View file

@ -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