mirror of
https://github.com/agessaman/MeshCore.git
synced 2026-10-23 10:42:30 +00:00
Fix remaining conflict marker in maintainAnalyzerConnections
This commit is contained in:
1 parent
921c6112cb
commit
0de7da8425
1 file changed
-5
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user