mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-12 03:04:27 +05:00
Fix merge conflict
This commit is contained in:
@@ -174,9 +174,6 @@ protected:
|
|||||||
wmBleAddress = new WiFiManagerParameter("ble_address", "BLE sensor address", settings.sensors.indoor.bleAddresss, 17);
|
wmBleAddress = new WiFiManagerParameter("ble_address", "BLE sensor address", settings.sensors.indoor.bleAddresss, 17);
|
||||||
wm.addParameter(wmBleAddress);
|
wm.addParameter(wmBleAddress);
|
||||||
|
|
||||||
wmBleAddress = new WiFiManagerParameter("ble_address", "BLE sensor address", settings.sensors.indoor.bleAddresss, 17);
|
|
||||||
wm.addParameter(wmBleAddress);
|
|
||||||
|
|
||||||
wmExtPumpHeader = new HeaderParameter("External pump");
|
wmExtPumpHeader = new HeaderParameter("External pump");
|
||||||
wm.addParameter(wmExtPumpHeader);
|
wm.addParameter(wmExtPumpHeader);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user