mirror of
https://github.com/jscrane/r65emu.git
synced 2024-06-01 22:41:30 +00:00
conflict
This commit is contained in:
parent
88b66effb1
commit
d281cf4bdd
|
@ -30,7 +30,6 @@
|
|||
#define SPIRAM_SIZE 65536
|
||||
|
||||
// "tape" storage...
|
||||
<<<<<<< HEAD
|
||||
#define SD_CS PF_3
|
||||
//#define SD_CS PE_0
|
||||
#define SD_SPI 1
|
||||
|
|
Loading…
Reference in New Issue
Block a user