From ae7820e8f28552ca1a19fe7612a6d1c02c5b633f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 16 Jan 2017 13:37:18 +0000
Subject: [PATCH] Fix merge

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

diff --git a/package.json b/package.json
index 054dedf9..f169cf9b 100644
--- a/package.json
+++ b/package.json
@@ -62,13 +62,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-<<<<<<< HEAD
-    "matrix-js-sdk": "0.7.2",
-    "matrix-react-sdk": "0.8.4",
-=======
     "matrix-js-sdk": "0.7.4",
     "matrix-react-sdk": "0.8.5",
->>>>>>> release-v0.9.6
     "modernizr": "^3.1.0",
     "q": "^1.4.1",
     "react": "^15.4.0",