clean up residual statements from manual merge

jhughes1010 · Apr 15, 2022 · 622ec93 · 622ec93
1 parent 87c3233
commit 622ec93
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/wifi.ino b/wifi.ino
@@ -3,17 +3,11 @@
 //=======================================================================
 long wifi_connect()
 {
-<<<<<<< HEAD
-  long wifi_signal = 0;
-
-  MonPrintf("Connecting to %s\n", App);
-=======
   bool WiFiConnectHalt = false;
   int retry = 0;
   long wifi_signal = 0;
 
   MonPrintf("Starting wifi for App = %s\n", App);
->>>>>>> develop
   if (App == "BLYNK")  // for posting datas to Blynk App
   {
 
@@ -23,11 +17,7 @@ long wifi_connect()
   {
     MonPrintf("Connecting to WiFi\n");
     WiFi.begin(ssid, pass);
-<<<<<<< HEAD
-    while (WiFi.status() != WL_CONNECTED)
-=======
     while (WiFi.status() != WL_CONNECTED && !WiFiConnectHalt )
->>>>>>> develop
     {
       delay(500);
       retry++;