From cf3a9c3126afd3f1eeb0b2dedaef30c4cbb554f3 Mon Sep 17 00:00:00 2001 From: agessaman Date: Sat, 8 Nov 2025 15:05:47 -0800 Subject: [PATCH] Remove conflict marker from CommonCLI.cpp --- src/helpers/CommonCLI.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index 976e57af..df37c94e 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -258,7 +258,6 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) { file.write((uint8_t *)&_prefs->mqtt_owner_public_key, sizeof(_prefs->mqtt_owner_public_key)); // 346 file.write((uint8_t *)&_prefs->mqtt_email, sizeof(_prefs->mqtt_email)); // 347 // 209 ->>>>>>> 6f42dc3 (Implement Let's Mesh Analyzer integration in MQTT Bridge) ======= >>>>>>> 3633002 (Refactor MQTT preferences handling in CommonCLI)