clean up merge conflicts

hoylabs · Dec 27, 2023 · 6ab706c · 6ab706c
1 parent 367e0f9
commit 6ab706c
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Hoymiles/src/Hoymiles.h b/lib/Hoymiles/src/Hoymiles.h
@@ -34,8 +34,8 @@ class HoymilesClass {
     HoymilesRadio_NRF* getRadioNrf();
     HoymilesRadio_CMT* getRadioCmt();
 
-    uint32_t PollInterval() const const;
-    void setPollInterval(const const uint32_t interval);
+    uint32_t PollInterval() const;
+    void setPollInterval(const uint32_t interval);
     void setVerboseLogging(bool verboseLogging);
 
     bool isAllRadioIdle() const;

diff --git a/src/PinMapping.cpp b/src/PinMapping.cpp
@@ -305,7 +305,7 @@ bool PinMappingClass::isValidEthConfig() const
     return _pinMapping.eth_enabled;
 }
 
-bool PinMappingClass::isValidHuaweiConfig()
+bool PinMappingClass::isValidHuaweiConfig() const
 {
     return _pinMapping.huawei_miso >= 0
         && _pinMapping.huawei_mosi >= 0