summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-09 21:15:07 +0000
committerQMK Bot <hello@qmk.fm>2021-08-09 21:15:07 +0000
commitf0a2641cf10f3b6a385c03ed63e08571baf0cb29 (patch)
tree4cc0e4dfdc7d5843867f23127b981234c96db207 /keyboards
parentbb2986c115d7a0269162426d33d663067be22b8a (diff)
parent760caaa9af9082a4502b3b2346f23d35a44b22bd (diff)
downloadqmk_firmware-f0a2641cf10f3b6a385c03ed63e08571baf0cb29.tar.gz
qmk_firmware-f0a2641cf10f3b6a385c03ed63e08571baf0cb29.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ristretto/rules.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/ristretto/rules.mk b/keyboards/ristretto/rules.mk
index f05e2271c2..a24dc0c544 100644
--- a/keyboards/ristretto/rules.mk
+++ b/keyboards/ristretto/rules.mk
@@ -2,7 +2,7 @@
MCU = atmega32u4
# Bootloader selection
-BOOTLOADER = caterina
+BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable