From 79d576d3ba8d6984e29bc6280c6523c6b9ba26ec Mon Sep 17 00:00:00 2001
From: Yordan Suarez <ysantiago1985@gmail.com>
Date: Tue, 19 Jul 2022 16:08:03 -0400
Subject: [PATCH] attempt to fix the update issue

---
 custom_components/fpl/manifest.json | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/custom_components/fpl/manifest.json b/custom_components/fpl/manifest.json
index 653f1ea..ec5fb6d 100644
--- 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"
 }
\ No newline at end of file