From 9b88194f9907a7b360ab97dff099b13e1173e3c4 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Thu, 12 Jun 2025 20:01:33 -0500
Subject: [PATCH] Update WiFiAPClient.cpp

---
 src/mesh/wifi/WiFiAPClient.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index b12e555f6..67ac19a26 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -503,8 +503,3 @@ uint8_t getWifiDisconnectReason()
 {
     return wifiDisconnectReason;
 }
-<<<<<<< master
-
-=======
-#endif
->>>>>>> master