From f2ef8111cd73a6c2126ac5cdb8c4b9fba4298b73 Mon Sep 17 00:00:00 2001
From: bohdan-s <bohdan-s@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:14:29 +1000
Subject: [PATCH] Update sungather.py

Fix merge conflicts
---
 SunGather/sungather.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SunGather/sungather.py b/SunGather/sungather.py
index a5055a5..219e6c2 100644
--- a/SunGather/sungather.py
+++ b/SunGather/sungather.py
@@ -36,7 +36,8 @@ class SungrowInverter():
         
         self.registers = [[]]
         self.registers.pop() # Remove null value from list
-        self.registers_custom = [{'name': 'export_to_grid', 'unit': 'W'}, {'name': 'import_from_grid', 'unit': 'W'}, {'name': 'run_state'}]        self.register_ranges = [[]]
+        self.registers_custom = [{'name': 'export_to_grid', 'unit': 'W'}, {'name': 'import_from_grid', 'unit': 'W'}, {'name': 'run_state'}]
+        self.register_ranges = [[]]
         self.register_ranges.pop() # Remove null value from list
 
         self.latest_scrape = {}