Merge remote-tracking branch 'origin/master' into develop

2021-09-12 05:28:01 +00:00
parent 1895151a9c 5af1799735
commit bda8924795
1410 changed files with 0 additions and 1412 deletions
--- a/keyboards/sixkeyboard/rules.mk
+++ b/keyboards/sixkeyboard/rules.mk
@@ -17,7 +17,6 @@ NKRO_ENABLE = no			# USB Nkey Rollover - if this doesn't work, see here: https:/
 BACKLIGHT_ENABLE = no	# Enable keyboard backlight functionality
 AUDIO_ENABLE = no
 UNICODE_ENABLE = no		# Unicode
-BLUETOOTH_ENABLE = no	# Enable Bluetooth with the Adafruit EZ-Key HID
 CUSTOM_MATRIX = yes

 SRC += matrix.c