fix merge mistake

binsentsu · Oct 12, 2021 · 9f47968 · 9f47968
1 parent d107ba1
commit 9f47968
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/custom_components/solaredge_modbus/__init__.py b/custom_components/solaredge_modbus/__init__.py
@@ -769,11 +769,8 @@ def decode_string(decoder):
 
                 self.data[battery_prefix + "attrs"] = battery_info
 
-<<<<<<< HEAD
+
         storage_data = self.read_holding_registers(address=start_address + 0x6C, count=28)
-=======
-        storage_data = self.read_holding_registers(unit=1, address=start_address + 0x6C, count=28)
->>>>>>> c1f186742f0b6daa2ea711be00ce4a2ff7d993a5
         if storage_data:
             decoder = BinaryPayloadDecoder.fromRegisters(
                 storage_data, byteorder=Endian.Big,wordorder=Endian.Little