修改sf_wifi_svr合并代码冲突

2024-01-08 18:53:08 +08:00 · 2024-01-08 18:53:08 +08:00 · dc4ddd2a3a
commit dc4ddd2a3a
parent 00623e27c2
1 changed files with 0 additions and 6 deletions
--- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
+++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
@ -430,15 +430,9 @@ S8 *appThumbKeyToName(thumbSize_t imgSize, thumbType_t fileType, UINT16 dirKey,
 		free(strg_path);
 		return SF_FAILURE;
 	}
-<<<<<<< Updated upstream
-    MLOGI("s1\n");
-	char font =sf_get_strg_dev()  == MMC_DEV_EMMC ? 'B' : 'A';
-=======

-	//char font = sf_get_strg_dev()  == MMC_DEV_EMMC ? 'B' : 'E';
 	UINT32 dcf_handle = (UINT32)System_Get_DCF_Handle(); /* 0:emmc 1:sd */
 	char font = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? 'B' : 'E';
->>>>>>> Stashed changes

    if(imgSize == THUMB_320x240)
    {