Skip to content

Commit 900fc13

Browse files
authored
fix merge error
1 parent 03b22be commit 900fc13

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

variants/esp32s3box/pins_arduino.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,6 @@ static const uint8_t T14 = 14;
6262
#define I2S_SDIN 16
6363
#define I2S_DOUT 15
6464

65-
<<<<<<< HEAD
66-
#define BOARD_HAS_SDMMC
67-
#define SDMMC_CLK 13
68-
#define SDMMC_CMD 11
69-
#define SDMMC_D0 14
70-
#define SDMMC_D1 12
71-
#define SDMMC_D2 10
72-
#define SDMMC_D3 9
73-
#define BOARD_MAX_SDMMC_FREQ SDMMC_FREQ_DEFAULT
74-
75-
=======
76-
>>>>>>> orig_master_espressif
7765
#define PA_PIN 46 //Audio Amp Power
7866
#define MUTE_PIN 1 //MUTE Button
7967
#define TS_IRQ 3 //Touch Screen IRQ

0 commit comments

Comments
 (0)