Fix other merge conflict

dbkr · dbkr · commit d068499184ae · 2016-10-27T10:52:17.000+01:00
diff --git a/package.json b/package.json
@@ -120,7 +120,7 @@
     "webpack": "^1.12.14"
   },
   "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": {
     "appId": "im.riot.app",
@@ -140,8 +140,5 @@
   "directories": {
     "buildResources": "electron/build",
     "output": "electron/dist"
-=======
-    "olm": "https://matrix.org/packages/npm/olm/olm-2.0.0.tgz"
->>>>>>> origin/develop
   }
 }
