From f7fa19dcf8e00d88193eaf5a22e70c480e6bc7f7 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Fri, 10 Feb 2017 15:52:14 +0200
Subject: [PATCH] Conflict merge

https://github.com/Jiiks/BetterDiscordApp/pull/424
---
 data/emotefilter.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/emotefilter.json b/data/emotefilter.json
index b2032f34..a9b628af 100644
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@@ -211,6 +211,8 @@
     "Samus",
     "Toad",
     "Poopy",
-    "Alexis"
+    "Alexis",
+    "Dante",
+    "Lotus"
   ]
 }