Merge branch 'DO360'

EVSE/Projects/DO360/Apps/main.c

@@ -1362,19 +1362,11 @@ void Check4gWifiReset(void)
 {
     if(ShmChargerInfo->Control.SysCtrl.bits.BackendEnable)
     {
-<<<<<<< HEAD
 //        PRINTF_FUNC("Internet: %d, Ocpp: %d, Wifi: %d, Telcom: %d",
 //                ShmSysConfigAndInfo->SysInfo.InternetConn,
 //                ShmSysConfigAndInfo->SysInfo.OcppConnStatus,
 //                ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode,
 //                ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled);
-=======
-        PRINTF_FUNC("Internet: %d, Ocpp: %d, Wifi: %d, Telcom: %d",
-                ShmSysConfigAndInfo->SysInfo.InternetConn,
-                ShmSysConfigAndInfo->SysInfo.OcppConnStatus,
-                ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode,
-                ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled);
->>>>>>> db8b46994f9d394b7a00b31806c6f9c2326981a7
         if(!ShmSysConfigAndInfo->SysInfo.InternetConn && !ShmSysConfigAndInfo->SysInfo.OcppConnStatus &&
             (ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode != _SYS_WIFI_MODE_DISABLE ||
             ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled == YES))