summaryrefslogtreecommitdiff
path: root/docs/newbs_git_resolving_merge_conflicts.md
diff options
context:
space:
mode:
authorqpockets <69164255+qpockets@users.noreply.github.com>2021-01-14 01:01:58 -0500
committerGitHub <noreply@github.com>2021-01-13 22:01:58 -0800
commiteb0ce0abc7f04a56d11250f37f56cc6bd84d9eeb (patch)
tree6382acb406aa8f34e9585674b11b412aeaca7280 /docs/newbs_git_resolving_merge_conflicts.md
parent501f3ed419cc8a07d156e2cac0f40cfad2485847 (diff)
[Keyboard] Add space space keyboard (#11425)
* add space_space keyboard * update space_space readme * fix space_space formatting issue * add layout readme, vid & pid * experiment * readme fix * readme fix * readme fix * readme formatting * readme formatting * readme formatting * Update keymap.c change I+O combo to O+P because of accidental activation * Update keymap.c change I+O combo to O+P because of accidental activation * Update readme.md change keymap readme to reflect keymap changes * Apply suggestions from code review remove deprecated "key count" from .json Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review -move combo and modtap defines to the keymap level -formatting issues Co-authored-by: Joel Challis <git@zvecr.com> * move combo defines to keymap level and update config.h * Apply suggestions from code review add lower resolution readme picture and sleep LED note Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'docs/newbs_git_resolving_merge_conflicts.md')
0 files changed, 0 insertions, 0 deletions