Conflict merge

https://github.com/Jiiks/BetterDiscordApp/pull/433
2017-02-10 15:50:16 +02:00 · 2017-02-10 15:50:16 +02:00 · 44073ed15d
parent 031c64271a
commit 44073ed15d
1 changed files with 2 additions and 1 deletions
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@ -210,6 +210,7 @@
    "Kirby",
    "Samus",
    "Toad",
-    "Poopy"
+    "Poopy",
+    "Alexis"
  ]
 }