From 5c1d559f3ab21b1095873513143fcf6379c6fa65 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Mon, 23 Apr 2018 08:13:57 +1200
Subject: [PATCH] Repairing failed merge

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

diff --git a/package.json b/package.json
index 2444830e..e8c1e213 100755
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "mopidy-iris",
-<<<<<<< Updated upstream
   "version": "3.17.1",
-=======
-  "version": "3.17.0",
->>>>>>> Stashed changes
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <james@barnsley.nz>",