summaryrefslogtreecommitdiff
path: root/docs/newbs_git_resolving_merge_conflicts.md
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2023-05-03 14:12:49 -0700
committerGitHub <noreply@github.com>2023-05-03 14:12:49 -0700
commitf6c685bcb6f59f841c3c8053c18e5fe471664807 (patch)
tree8e7a9179b701b50082a59373b2f983357544b08f /docs/newbs_git_resolving_merge_conflicts.md
parent29759031ae48ee24c77f23479108726a31addc74 (diff)
JKeys Design Gentleman65 Suited Edition Layout Macro Addition (#20685)
* add matrix_diagram.md * info.json: apply friendly formatting * rename LAYOUT_all to LAYOUT_65_ansi_rwkl_split_bs * add LAYOUT_65_ansi_wkl_split_bs * Update keyboards/jkeys_design/gentleman65_se_s/info.json
Diffstat (limited to 'docs/newbs_git_resolving_merge_conflicts.md')
0 files changed, 0 insertions, 0 deletions