Fix merge conflict

This commit is contained in:
Menno de Graaf
2023-12-10 14:24:35 +01:00
parent b416110d4f
commit ea86bbff30

View File

@@ -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);