attempt to fix the update issue

2022-07-19 16:08:03 -04:00
parent 2d1d0d5470
commit 79d576d3ba
1 changed files with 2 additions and 7 deletions
--- a/custom_components/fpl/manifest.json
+++ b/custom_components/fpl/manifest.json
@@ -11,12 +11,7 @@
  "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
+  "issue_tracker": "https://github.com/dotKrad/hass-fpl/issues",
+  "homeassistant": "2021.12.7"
 }