aboutsummaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution
diff options
context:
space:
mode:
authorGravatar https://id.koumbit.net/anarcat <https://id.koumbit.net/anarcat@web>2015-02-11 15:05:32 +0000
committerGravatar admin <admin@branchable.com>2015-02-11 15:05:32 +0000
commit1366e7a8d4755b8e2dfea620ce3b32eaa2496b19 (patch)
tree32f1014a86f12a7bff927eac096cbbfd806c254a /doc/automatic_conflict_resolution
parentf638eff8d4b04784b08e10d1cca58bb6cab0dc45 (diff)
Added a comment
Diffstat (limited to 'doc/automatic_conflict_resolution')
0 files changed, 0 insertions, 0 deletions