Merge remote-tracking branch 'origin/master'

2022-01-22 23:00:41 -05:00
parent 2a07dc06c1 8e36810701
commit 6c76ea4730
14 changed files with 567 additions and 63 deletions
--- a/custom_components/fpl/manifest.json
+++ b/custom_components/fpl/manifest.json
@@ -11,6 +11,12 @@
  "requirements": [
    "integrationhelper"
  ],
+<<<<<<< HEAD
  "version": "1.0.0",
  "issue_tracker": "https://github.com/dotKrad/hass-fpl/issues"
+=======
+  "homeassistant": "2021.12.7",
+  "version": "1.0.0",
+  "issue_tracker" : "https://github.com/dotKrad/hass-fpl/issues"
+>>>>>>> master
 }