From 0de7da84252554f5d28c194295d75b990dbd83d4 Mon Sep 17 00:00:00 2001
From: agessaman <adam@gessaman.com>
Date: Sat, 8 Nov 2025 14:57:41 -0800
Subject: [PATCH] Fix remaining conflict marker in maintainAnalyzerConnections

---
 src/helpers/bridges/MQTTBridge.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/helpers/bridges/MQTTBridge.cpp b/src/helpers/bridges/MQTTBridge.cpp
index 11c61981..a6c1b3ea 100644
--- a/src/helpers/bridges/MQTTBridge.cpp
+++ b/src/helpers/bridges/MQTTBridge.cpp
@@ -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;
   }