summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-30 20:24:18 +0000
committerQMK Bot <hello@qmk.fm>2021-04-30 20:24:18 +0000
commit876352a030c213aa04cff323ab94ea1cb1547064 (patch)
tree5d5a02207050e5b43407c7528615c0c5f223758a /keyboards
parent109b46278943f8f079ae508f20e07a5a75af90d8 (diff)
parent18dc12cd78448bffe4ad54aa15aa715ee959e64c (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/meishi2/rules.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/meishi2/rules.mk b/keyboards/meishi2/rules.mk
index f1d011ad6a..b828d7c361 100644
--- a/keyboards/meishi2/rules.mk
+++ b/keyboards/meishi2/rules.mk
@@ -9,7 +9,7 @@ MCU = atmega32u4
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
-BOOTLOADER = atmel-dfu
+BOOTLOADER = caterina
# Build Options
# change yes to no to disable