Conflict merge

https://github.com/Jiiks/BetterDiscordApp/pull/424
2017-02-10 15:52:14 +02:00 · 2017-02-10 15:52:14 +02:00 · f7fa19dcf8
parent 44073ed15d
commit f7fa19dcf8
1 changed files with 3 additions and 1 deletions
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@ -211,6 +211,8 @@
    "Samus",
    "Toad",
    "Poopy",
-    "Alexis"
+    "Alexis",
+    "Dante",
+    "Lotus"
  ]
 }