frodovdr
/
dddvb
mirror of https://github.com/DigitalDevices/dddvb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

remove conflict

This commit is contained in:
Ralph Metzler 2016-03-22 22:43:14 +01:00 committed by mvoelkel
parent 6038e87250
commit b479d9cdc2
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/octonet/ddtest.c
View File

@ -192,17 +192,10 @@ int FlashDetect(int dev)
printf("Flash: SPANSION S25FL116K 16 MBit\n");
break;
case SPANSION_S25FL132K :
<<<<<<< 472e247726096a6d88583bfaac91ce1f10f91c82
printf("Flash: SPANSION S25FL132K 32 MBit\n");
break;
case SPANSION_S25FL164K :
printf("Flash: SPANSION S25FL164K 64 MBit\n");
=======
printf("Flash: SPANSION S25FL116K 32 MBit\n");
break;
case SPANSION_S25FL164K :
printf("Flash: SPANSION S25FL116K 64 MBit\n");
>>>>>>> add license support
break;
}
return r;