mirror of
https://github.com/mfulz/qmk_firmware.git
synced 2025-08-18 18:40:47 +02:00

Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py
Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py