From ad68a29f37ccd3226be83e59081fe40bed241531 Mon Sep 17 00:00:00 2001 From: agessaman Date: Sat, 8 Nov 2025 15:06:02 -0800 Subject: [PATCH] Remove remaining conflict markers from CommonCLI.cpp --- src/helpers/CommonCLI.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index df37c94e..2ceb663d 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -258,8 +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 -======= ->>>>>>> 3633002 (Refactor MQTT preferences handling in CommonCLI) file.close(); }