ac3b7d79e0
Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py |
||
---|---|---|
.. | ||
bolt | ||
dimple | ||
dimpleplus | ||
the30 | ||
the50 | ||
the60 |
ac3b7d79e0
Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py |
||
---|---|---|
.. | ||
bolt | ||
dimple | ||
dimpleplus | ||
the30 | ||
the50 | ||
the60 |