Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py
|
||
|---|---|---|
| .. | ||
| dawn60 | ||
| kangaroo | ||
| snap96 | ||
| trinityxttkl | ||
| valor/rev1 | ||
| valor_frl_tkl | ||
Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py
|
||
|---|---|---|
| .. | ||
| dawn60 | ||
| kangaroo | ||
| snap96 | ||
| trinityxttkl | ||
| valor/rev1 | ||
| valor_frl_tkl | ||