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

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

diff --git a/data/emotefilter.json b/data/emotefilter.json
index 8f18e2b..b2032f3 100644
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@@ -210,6 +210,7 @@
     "Kirby",
     "Samus",
     "Toad",
-    "Poopy"
+    "Poopy",
+    "Alexis"
   ]
 }