Conflicts: README.md boards.txt cores/arduino/USB/USBCore.cpp platform.txt variants/arduino_zero/variant.cpp |
||
|---|---|---|
| .. | ||
| flash_with_bootloader.ld | ||
| flash_without_bootloader.ld | ||
Conflicts: README.md boards.txt cores/arduino/USB/USBCore.cpp platform.txt variants/arduino_zero/variant.cpp |
||
|---|---|---|
| .. | ||
| flash_with_bootloader.ld | ||
| flash_without_bootloader.ld | ||