From f8b263e359944f299527a058d9bfbc33cfdf62f3 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 15 Feb 2020 11:05:13 -0600
Subject: [PATCH] add conflict with master data

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

diff --git a/data/FilterList.json b/data/FilterList.json
index 500557d7f..3a812210b 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": "CONFLICT A filter list that blocks mobile advertisements and trackers on Japanese properties",
     "homeUrl": "https://280blocker.net",
     "licenseId": 1,
     "name": "280 Blocker",