summaryrefslogtreecommitdiffstats
path: root/docs/ja/newbs_git_resolving_merge_conflicts.md
diff options
context:
space:
mode:
authorWilba <wilba@wilba.tech>2020-11-20 20:42:34 +1100
committerGitHub <noreply@github.com>2020-11-20 01:42:34 -0800
commitccb15c2d2923903a925d253eec66fd4356ceea85 (patch)
tree316be35c487c738e05b8621b356e174b9275d3be /docs/ja/newbs_git_resolving_merge_conflicts.md
parent628d4a91b905bad049d267c133a59c8b24f9acbf (diff)
[Keyboard] Added wilba.tech WT60-H1 (#10879)
* Added WT60-H1 * Update keyboards/wilba_tech/wt60_h1/info.json * Update keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c * Update keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c * Update keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c * Update keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c * Update keyboards/wilba_tech/wt60_h1/rules.mk * Update keyboards/wilba_tech/wt60_h1/wt60_h1.h
Diffstat (limited to 'docs/ja/newbs_git_resolving_merge_conflicts.md')
0 files changed, 0 insertions, 0 deletions