6502/r65emu
1
0
Fork 0
mirror of https://github.com/jscrane/r65emu.git synced 2024-12-21 12:29:51 +00:00
Code Issues Projects Releases Wiki Activity

conflict

Browse Source
This commit is contained in:
Stephen Crane 2018-08-14 10:15:15 +01:00
parent 88b66effb1
commit d281cf4bdd
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hardware.h
View File

@ -30,7 +30,6 @@
#define SPIRAM_SIZE 65536 #define SPIRAM_SIZE 65536
// "tape" storage... // "tape" storage...
<<<<<<< HEAD
#define SD_CS PF_3 #define SD_CS PF_3
//#define SD_CS PE_0 //#define SD_CS PE_0
#define SD_SPI 1 #define SD_SPI 1