Conflicts: README.md boards.txt cores/arduino/USB/USBCore.cpp platform.txt variants/arduino_zero/variant.cpp |
||
|---|---|---|
| .. | ||
| samd21_sam_ba_arduino_mkrzero.bin | ||
| samd21_sam_ba_arduino_mkrzero.hex | ||
Conflicts: README.md boards.txt cores/arduino/USB/USBCore.cpp platform.txt variants/arduino_zero/variant.cpp |
||
|---|---|---|
| .. | ||
| samd21_sam_ba_arduino_mkrzero.bin | ||
| samd21_sam_ba_arduino_mkrzero.hex | ||