Skip to content

Commit ce2f5f9

Browse files
pvizelipvizeli
committed
Resolve merge conflict by version.json
2 parents 5abe7a3 + 01f767e commit ce2f5f9

File tree

5 files changed

+4
-163
lines changed

5 files changed

+4
-163
lines changed

‎hassio/const.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Const file for HassIO."""
22
from pathlib import Path
33

4-
HASSIO_VERSION = '0.44'
4+
HASSIO_VERSION = '0.45'
55

66
URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
77
'hassio/master/version.json')

‎hassio/panel/hassio-main.html

Lines changed: 1 addition & 160 deletions
Large diffs are not rendered by default.

‎hassio/panel/hassio-main.html.gz

20.8 KB
Binary file not shown.

‎home-assistant-polymer

‎version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"hassio": "0.44",
2+
"hassio": "0.45",
33
"homeassistant": "0.49",
44
"resinos": "0.8",
55
"resinhup": "0.1",

0 commit comments

Comments
 (0)