summaryrefslogtreecommitdiff
path: root/doc/install/OSX.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-14 14:18:15 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-14 14:18:15 -0400
commit12812225b5bc7d8b54722c6b4082e5e753a4ff3f (patch)
tree7a6532cf0702962cc298d370b6848c59975e5ac4 /doc/install/OSX.mdwn
parent3e3c6597cf226803b93fd661fd3ee43dc7d630f0 (diff)
add a note after successful conflicted merge resolution
Diffstat (limited to 'doc/install/OSX.mdwn')
0 files changed, 0 insertions, 0 deletions