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

Fix other merge conflict

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

5
package.json
View file

@ -120,7 +120,7 @@
"webpack": "^1.12.14" "webpack": "^1.12.14"
}, },
"optionalDependencies": { "optionalDependencies": {
"olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz" "olm": "https://matrix.org/packages/npm/olm/olm-2.0.0.tgz"
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
@ -140,8 +140,5 @@
"directories": { "directories": {
"buildResources": "electron/build", "buildResources": "electron/build",
"output": "electron/dist" "output": "electron/dist"
=======
"olm": "https://matrix.org/packages/npm/olm/olm-2.0.0.tgz"
>>>>>>> origin/develop
} }
} }