From d068499184ae1bb786a07ef734d0faef0c01f4c1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 27 Oct 2016 10:52:17 +0100
Subject: [PATCH] Fix other merge conflict

---
 package.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.json b/package.json
index b2ee54f2e9..eb8c8f5e90 100644
--- 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
   }
 }