diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-01-21 12:50:09 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-01-21 12:50:09 -0400 |
commit | 2f2635528d8e428e0fafaf7877a4572a397cdf52 (patch) | |
tree | aea27617e406050b507efa379ea6a1bf7497d6d3 /doc/automatic_conflict_resolution.mdwn | |
parent | 14a50deef7c83c104ce5e706dfb2e9887a37e663 (diff) |
update my email address and homepage url
Diffstat (limited to 'doc/automatic_conflict_resolution.mdwn')
0 files changed, 0 insertions, 0 deletions