summaryrefslogtreecommitdiff
path: root/docs/newbs_git_resolving_merge_conflicts.md
diff options
context:
space:
mode:
authoryiancar <yiangosyiangou@cytanet.com.cy>2020-01-21 23:09:50 +0000
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-01-21 15:09:50 -0800
commitf7730567509619e31742ce0a2aa5ae7cfe21d23e (patch)
tree2b17a9e882d556819e01be9beb67ea0c30929d0e /docs/newbs_git_resolving_merge_conflicts.md
parentb70500806ab047907b161ed6fa0dc32ba8a91784 (diff)
downloadqmk_firmware-f7730567509619e31742ce0a2aa5ae7cfe21d23e.tar.gz
qmk_firmware-f7730567509619e31742ce0a2aa5ae7cfe21d23e.zip
[Keyboard] HS60 Refactor (Keymap restructure to be more standardized) (#7847)
* Keymap restructure to be more standardized * made bootmagic lite default * Dividing keymaps * Update keyboards/hs60/v2/v2.c
Diffstat (limited to 'docs/newbs_git_resolving_merge_conflicts.md')
0 files changed, 0 insertions, 0 deletions