fix merge conflict

2016-08-04 23:45:28 +01:00
parent cf70f1731e 0351ab0a3d
commit d0158f5812
6 changed files with 175 additions and 8 deletions
@@ -30,7 +30,7 @@
    "draft-js-export-html": "^0.2.2",
    "draft-js-export-markdown": "^0.2.0",
    "draft-js-import-markdown": "^0.1.6",
-    "emojione": "^2.2.2",
+    "emojione": "2.2.3",
    "favico.js": "^0.3.10",
    "filesize": "^3.1.2",
    "flux": "^2.0.3",