Fix merge

2017-01-16 13:37:18 +00:00 · 2017-01-16 13:37:18 +00:00 · ae7820e8f2
parent 3023ea5335
commit ae7820e8f2
1 changed files with 0 additions and 5 deletions
--- a/package.json
+++ b/package.json
@ -62,13 +62,8 @@
    "gfm.css": "^1.1.1",
    "highlight.js": "^9.0.0",
    "linkifyjs": "^2.1.3",
-<<<<<<< HEAD
-    "matrix-js-sdk": "0.7.2",
-    "matrix-react-sdk": "0.8.4",
-=======
    "matrix-js-sdk": "0.7.4",
    "matrix-react-sdk": "0.8.5",
->>>>>>> release-v0.9.6
    "modernizr": "^3.1.0",
    "q": "^1.4.1",
    "react": "^15.4.0",