diff options
author | https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc <Matthias@web> | 2014-04-19 17:26:11 +0000 |
---|---|---|
committer | admin <admin@branchable.com> | 2014-04-19 17:26:11 +0000 |
commit | 4dbf18e8582f2e751853cfafcbd657b93f903230 (patch) | |
tree | 77e6b3aef973239207fbac5b7575b648b552cb9e /Upgrade.hs | |
parent | effa3565f4dd8467080212bc6694ed3872f87b65 (diff) |
Added a comment: auto conflict resolution
Diffstat (limited to 'Upgrade.hs')
0 files changed, 0 insertions, 0 deletions