Fix remaining conflict marker in maintainAnalyzerConnections

This commit is contained in:
agessaman
2026-01-02 13:36:41 -08:00
parent 921c6112cb
commit 0de7da8425
-5
View File
@@ -1333,11 +1333,6 @@ void MQTTBridge::publishStatusToAnalyzerClient(PsychicMqttClient* client, const
}
void MQTTBridge::maintainAnalyzerConnections() {
<<<<<<< HEAD
// PsychicMqttClient handles connection maintenance and reconnection automatically
// No manual maintenance needed - the library manages this internally
// Connection state changes are handled via the onConnect/onDisconnect callbacks
=======
if (!_identity) {
return;
}