summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution
diff options
context:
space:
mode:
authorGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 <https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4@web>2015-12-21 15:46:53 +0000
committerGravatar admin <admin@branchable.com>2015-12-21 15:46:53 +0000
commitce673ccfa973f3030923384486dcdde1498a8c23 (patch)
tree3ed6c3b5cbf21b8ec96fe129475ef6d517557d94 /doc/automatic_conflict_resolution
parentf0429ececc14b607c5f021243c4ad33501a36dc4 (diff)
Added a comment
Diffstat (limited to 'doc/automatic_conflict_resolution')
0 files changed, 0 insertions, 0 deletions