From f6a6aa5ca27cd36152d830d156520a10841cce67 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sun, 16 Feb 2020 17:03:00 -0600
Subject: [PATCH] test migrate conflict

---
 data/FilterList.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/FilterList.json b/data/FilterList.json
index 6afa98dac..68008c845 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -1,7 +1,7 @@
 [
   {
     "id": 1,
-    "description": "TEMP A filter list that blocks mobile advertisements and trackers on Japanese properties",
+    "description": "TEMP2 A filter list that blocks mobile advertisements and trackers on Japanese properties",
     "homeUrl": "https://280blocker.net",
     "licenseId": 1,
     "name": "280 Blocker",