Resolve merge conflict by version.json

2025-07-24 09:36:31 +00:00 · 2017-07-17 09:46:21 +02:00 · 2017-07-17 09:46:21 +02:00 · ce2f5f9f7a
commit ce2f5f9f7a
parent 5abe7a3fb9 01f767e66c
5 changed files with 4 additions and 163 deletions
--- a/hassio/const.py
+++ b/hassio/const.py
@ -1,7 +1,7 @@
 """Const file for HassIO."""
 from pathlib import Path

-HASSIO_VERSION = '0.44'
+HASSIO_VERSION = '0.45'

 URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
                      'hassio/master/version.json')
--- a/hassio/panel/hassio-main.html
+++ b/hassio/panel/hassio-main.html
--- a/hassio/panel/hassio-main.html.gz
+++ b/hassio/panel/hassio-main.html.gz
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit d2a56655d086a040e712680e46e191d78949dfa3
+Subproject commit 35c4e1d5ae925119fcc7c2f3cf31c5f4d09c4124
--- a/version.json
+++ b/version.json
@ -1,5 +1,5 @@
 {
-    "hassio": "0.44",
+    "hassio": "0.45",
    "homeassistant": "0.49",
    "resinos": "0.8",
    "resinhup": "0.1",