PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix merge

Browse source
This commit is contained in:
David Baker 2017-01-16 13:37:18 +00:00
parent 3023ea5335
commit ae7820e8f2
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package.json
View file

@ -62,13 +62,8 @@
"gfm.css": "^1.1.1", "gfm.css": "^1.1.1",
"highlight.js": "^9.0.0", "highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3", "linkifyjs": "^2.1.3",
<<<<<<< HEAD
"matrix-js-sdk": "0.7.2",
"matrix-react-sdk": "0.8.4",
=======
"matrix-js-sdk": "0.7.4", "matrix-js-sdk": "0.7.4",
"matrix-react-sdk": "0.8.5", "matrix-react-sdk": "0.8.5",
>>>>>>> release-v0.9.6
"modernizr": "^3.1.0", "modernizr": "^3.1.0",
"q": "^1.4.1", "q": "^1.4.1",
"react": "^15.4.0", "react": "^15.4.0",