Merging

2019-03-15 14:14:48 +13:00
parent bb483b143e 07d62c6063
commit 7a077a2e6c
3 changed files with 14 additions and 2 deletions
--- a/mopidy_iris/static/app/app.js.map
+++ b/mopidy_iris/static/app/app.js.map
--- a/mopidy_iris/static/app/app.min.js.map
+++ b/mopidy_iris/static/app/app.min.js.map
--- a/mopidy_iris/static/index.html
+++ b/mopidy_iris/static/index.html
@ -98,7 +98,11 @@

 	// Release details
 	// These are automatically injected to built HTML
+<<<<<<< HEAD
 	var build = "1552610681";
+=======
+	var build = "1552376595";
+>>>>>>> 07d62c6063f8c39f8036a54f87b636dbd46ef1d5
 	var version = "3.33.0";

 	// Construct the script tag