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

This commit is contained in:
QMK Bot
2022-11-08 01:05:41 +00:00
14 changed files with 1290 additions and 1320 deletions
+1 -1
View File
@@ -215,7 +215,7 @@ def parse_configurator_json(configurator_file):
exit(1)
orig_keyboard = user_keymap['keyboard']
aliases = json_load(Path('data/mappings/keyboard_aliases.json'))
aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
if orig_keyboard in aliases:
if 'target' in aliases[orig_keyboard]: