From 654ba0ec7e78eb91c159f391bc99754b27211146 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sun, 22 Aug 2021 17:07:57 +1200
Subject: [PATCH] Buildout

---
 mopidy_iris/static/index.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mopidy_iris/static/index.html b/mopidy_iris/static/index.html
index 07cd2c5c..b3c30756 100644
--- a/mopidy_iris/static/index.html
+++ b/mopidy_iris/static/index.html
@@ -115,11 +115,7 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-<<<<<<< HEAD
-	var build = "1629608732";
-=======
-	var build = "1629516953";
->>>>>>> master
+	var build = "1629608847";
 	var version = "3.58.1";
 
 	// Construct the script tag