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

https://github.com/Jiiks/BetterDiscordApp/pull/420
---
 data/emotefilter.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/data/emotefilter.json b/data/emotefilter.json
index 0d28fe6..8f18e2b 100644
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@@ -202,6 +202,14 @@
     "Shitpost",
     "Dunno",
     "Challenge",
-    "Shulk"
+    "Shulk",
+    "Peach",
+    "Leffen",
+    "STEAK",
+    "Lars",
+    "Kirby",
+    "Samus",
+    "Toad",
+    "Poopy"
   ]
 }