From 43e836ac41e0f3b2ee4ae2b6ec2a9db818b67a0f Mon Sep 17 00:00:00 2001 From: helgeerbe Date: Mon, 24 Jul 2023 13:23:50 +0200 Subject: [PATCH] resolve merge conflict with upstream/master --- include/Configuration.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/Configuration.h b/include/Configuration.h index d979f815..be1864d2 100644 --- a/include/Configuration.h +++ b/include/Configuration.h @@ -129,14 +129,6 @@ struct CONFIG_T { bool Vedirect_Enabled; bool Vedirect_UpdatesOnly; - INVERTER_CONFIG_T Inverter[INV_MAX_COUNT]; - - uint64_t Dtu_Serial; - uint32_t Dtu_PollInterval; - uint8_t Dtu_NrfPaLevel; - int8_t Dtu_CmtPaLevel; - uint32_t Dtu_CmtFrequency; - bool PowerMeter_Enabled; bool PowerMeter_VerboseLogging; uint32_t PowerMeter_Interval;