ac3b7d79e0
Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py |
||
---|---|---|
.. | ||
number_pad | ||
s60_x | ||
s65_plus | ||
s65_x |
ac3b7d79e0
Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py |
||
---|---|---|
.. | ||
number_pad | ||
s60_x | ||
s65_plus | ||
s65_x |