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/hacs.json
+++ b/hacs.json
@@ -1,8 +1,13 @@
 {
+<<<<<<< HEAD
    "name": "FPL",
    "country": "US",
    "domains": [
        "sensor"
    ],
    "homeassistant": "2021.12.0"
+=======
+  "name": "Hass Fpl",
+  "country": ["US"]
+>>>>>>> master
 }