diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-27 13:08:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-27 13:08:32 -0400 |
| commit | 048b64024a14feb0d9ed26abe97c542cfacbc8af (patch) | |
| tree | ff17714706a56f2af7b7ef8f550070344fd6b0ff /debian/rules | |
| parent | 051c68041b5b7a58e7080403e389d0641691edfd (diff) | |
sync: Automatically resolves merge conflicts.
untested, but it compiles :)
Diffstat (limited to 'debian/rules')
0 files changed, 0 insertions, 0 deletions