Fix merge fail

dbkr · dbkr · commit 62b1282060a5 · 2016-10-27T10:48:37.000+01:00
diff --git 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": {
