Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py
|
||
|---|---|---|
| .. | ||
| booster | ||
| canoe | ||
| canoe_gen2 | ||
| skog | ||
| skog_lite | ||
| readme.md | ||
Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py
|
||
|---|---|---|
| .. | ||
| booster | ||
| canoe | ||
| canoe_gen2 | ||
| skog | ||
| skog_lite | ||
| readme.md | ||