Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py
|
||
|---|---|---|
| .. | ||
| ave | ||
| little_foot | ||
| romac | ||
| romac_plus | ||
| ropro | ||
| smd_milk | ||
| soap | ||
Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py
|
||
|---|---|---|
| .. | ||
| ave | ||
| little_foot | ||
| romac | ||
| romac_plus | ||
| ropro | ||
| smd_milk | ||
| soap | ||