Dejar como master melkati

Coscolin · Feb 4, 2024 · 0c2f1c7 · 0c2f1c7
1 parent 3e13680
commit 0c2f1c7
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h
@@ -88,8 +88,6 @@ char tempMQTTUser[] = "                              ";
 char tempMQTTPass[] = "                              ";
 char tempWiFiSSID[] = "                              ";
 char tempWiFiPasswrd[] = "                              ";
-char tempWiFiSSID2[] = "                              ";
-char tempWiFiPasswrd2[] = "                              ";
 char tempHostName[] = "                              ";
 char tempBLEDeviceId[] = "                              ";
 char tempCO2Sensor[] = "                              ";
@@ -404,16 +402,8 @@ TOGGLE(activeOTA, activeOTAMenu, "OTA Enable: ", doNothing,noEvent, wrapStyle
 
 MENU(wifiConfigMenu, "WIFI Config", doNothing, noEvent, wrapStyle
   ,SUBMENU(activeWIFIMenu)
-<<<<<<< HEAD
-  ,SUBMENU(searchWIFIMenu)
   ,EDIT("SSID", tempWiFiSSID, ssidChars, doSetWiFiSSID, exitEvent, wrapStyle)
   ,EDIT("Pass:", tempWiFiPasswrd, allChars, doSetWiFiPasswrd, exitEvent, wrapStyle)
-=======
-  ,EDIT("SSID1", tempWiFiSSID, ssidChars, doSetWiFiSSID, exitEvent, wrapStyle)
-  ,EDIT("PASS1:", tempWiFiPasswrd, allChars, doSetWiFiPasswrd, exitEvent, wrapStyle)
-  ,EDIT("SSID2", tempWiFiSSID2, ssidChars, doSetWiFiSSID2, exitEvent, wrapStyle)
-  ,EDIT("PASS2:", tempWiFiPasswrd2, allChars, doSetWiFiPasswrd2, exitEvent, wrapStyle)
->>>>>>> 56fa71210855b96b41690aad2566683b671c8fe7
   ,EDIT("Host:", tempHostName, allChars, doSetHostName, exitEvent, wrapStyle)
 #ifdef SUPPORT_OTA
   ,SUBMENU(activeOTAMenu)