Remove conflict marker from CommonCLI.cpp

2026-08-28 07:34:39 +00:00 · 2026-01-02 13:36:41 -08:00
parent 453c4184c3
commit cf3a9c3126
1 changed files with 0 additions and 1 deletions
@@ -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)