From 3feb2cd57b21a6697fe8bb154707a86ea10ce3ea Mon Sep 17 00:00:00 2001 From: agessaman Date: Sat, 8 Nov 2025 15:06:36 -0800 Subject: [PATCH] Remove final conflict marker from CommonCLI.cpp --- src/helpers/CommonCLI.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index 2ceb663d..1b19f01a 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -227,10 +227,6 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) { file.write(pad, to_write); remaining -= to_write; } -<<<<<<< HEAD -======= - // MQTT settings - file.write((uint8_t *)&_prefs->mqtt_origin, sizeof(_prefs->mqtt_origin)); // 162 file.write((uint8_t *)&_prefs->mqtt_iata, sizeof(_prefs->mqtt_iata)); // 194 file.write((uint8_t *)&_prefs->mqtt_status_enabled, sizeof(_prefs->mqtt_status_enabled)); // 202 file.write((uint8_t *)&_prefs->mqtt_packets_enabled, sizeof(_prefs->mqtt_packets_enabled)); // 203