summaryrefslogtreecommitdiff
path: root/docs/newbs_git_resolving_merge_conflicts.md
diff options
context:
space:
mode:
authorshela <shelaf@users.noreply.github.com>2021-10-10 05:02:55 +0900
committerGitHub <noreply@github.com>2021-10-09 21:02:55 +0100
commit969596bd679dfee93534c3535df216d137b67895 (patch)
tree7e9d15d736174b70bea2167820ee7b3d11edb572 /docs/newbs_git_resolving_merge_conflicts.md
parent82bf688e4499b0646979a47f98c0c0dd59bd70c2 (diff)
Update Japanese document (#14769)
Diffstat (limited to 'docs/newbs_git_resolving_merge_conflicts.md')
0 files changed, 0 insertions, 0 deletions