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