From 62b1282060a5c33d0d55a7eca92e9008b6e875a2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 27 Oct 2016 10:48:37 +0100
Subject: [PATCH] Fix merge fail

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 0b18d4ef4c..b2ee54f2e9 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,6 @@
     "webpack": "^1.12.14"
   },
   "optionalDependencies": {
-<<<<<<< HEAD
     "olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz"
   },
   "build": {