mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Fix merge fail

Browse source
This commit is contained in:
David Baker 2016-10-27 10:48:37 +01:00
parent 24610f4d18
commit 62b1282060
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -120,7 +120,6 @@
"webpack": "^1.12.14" "webpack": "^1.12.14"
}, },
"optionalDependencies": { "optionalDependencies": {
<<<<<<< HEAD
"olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz" "olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz"
}, },
"build": { "build": {