mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-07-14 12:54:33 -04:00
ac3b7d79e0
Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py