summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc <Matthias@web>2014-03-20 09:10:45 +0000
committerGravatar admin <admin@branchable.com>2014-03-20 09:10:45 +0000
commit049247aeae920d0e6984f4a707206abdb966aa32 (patch)
tree3f900da62ccd5f91c74692015fb9bef789b5207b /doc/automatic_conflict_resolution
parent3f71bd5711098388eb3df8f8d60be4c9fc4749ee (diff)
Added a comment: Build failure
Diffstat (limited to 'doc/automatic_conflict_resolution')
0 files changed, 0 insertions, 0 deletions