summaryrefslogtreecommitdiffstats
path: root/docs/newbs_git_resolving_merge_conflicts.md
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-02-02 02:40:30 +0000
committerQMK Bot <hello@qmk.fm>2020-02-02 02:40:30 +0000
commit4888a118c363ed73d913ef8c70eb643dd3ea8bd0 (patch)
tree9e90bd5dfdf0f6a5aee16431527c96aa594ebeb2 /docs/newbs_git_resolving_merge_conflicts.md
parente036b94a215157bb45913a22267d709ec5c6ef5f (diff)
format code according to conventions [skip ci]
Diffstat (limited to 'docs/newbs_git_resolving_merge_conflicts.md')
0 files changed, 0 insertions, 0 deletions