Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py
|
||
|---|---|---|
| .. | ||
| abishalom | ||
| bonta | ||
| default | ||
| default_md | ||
| emptyflask | ||
| ewersp | ||
| favorable-mutation | ||
| mac | ||
| mac_md | ||
| pregame | ||
| reywood | ||
| xulkal | ||
Resolved Conflicts:
keyboards/kc60/rules.mk
keyboards/xd96/rules.mk
lib/python/qmk/cli/__init__.py
|
||
|---|---|---|
| .. | ||
| abishalom | ||
| bonta | ||
| default | ||
| default_md | ||
| emptyflask | ||
| ewersp | ||
| favorable-mutation | ||
| mac | ||
| mac_md | ||
| pregame | ||
| reywood | ||
| xulkal | ||