ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-07 06:58:25 +00:00
Code Issues Packages Projects Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files
package.json
-1
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": {