769ca0d8f8
Conflicts: core/include/esp/rtc_regs.h include/espressif/spi_flash.h |
||
---|---|---|
.. | ||
libmain | ||
component.mk |
769ca0d8f8
Conflicts: core/include/esp/rtc_regs.h include/espressif/spi_flash.h |
||
---|---|---|
.. | ||
libmain | ||
component.mk |