diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-11 12:12:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-11 12:12:34 -0400 |
| commit | 803d6ad2c41db8a3852702b94d2505ab30eb5626 (patch) | |
| tree | 3bfce9d45d4c4b777fd2ca4366bac27d1460a299 /doc/automatic_conflict_resolution | |
| parent | e3260722fad082352ebcf13bdaf521efd78675d1 (diff) | |
typo
Diffstat (limited to 'doc/automatic_conflict_resolution')
0 files changed, 0 insertions, 0 deletions