From ea86bbff302f875c5dca89e00220acfc3fffddcc Mon Sep 17 00:00:00 2001 From: Menno de Graaf Date: Sun, 10 Dec 2023 14:24:35 +0100 Subject: [PATCH] Fix merge conflict --- src/WifiManagerTask.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/WifiManagerTask.h b/src/WifiManagerTask.h index e7e8d37..e325240 100644 --- a/src/WifiManagerTask.h +++ b/src/WifiManagerTask.h @@ -174,9 +174,6 @@ protected: wmBleAddress = new WiFiManagerParameter("ble_address", "BLE sensor address", settings.sensors.indoor.bleAddresss, 17); wm.addParameter(wmBleAddress); - wmBleAddress = new WiFiManagerParameter("ble_address", "BLE sensor address", settings.sensors.indoor.bleAddresss, 17); - wm.addParameter(wmBleAddress); - wmExtPumpHeader = new HeaderParameter("External pump"); wm.addParameter(wmExtPumpHeader);