diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 20:59:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 20:59:17 +0200 |
| commit | 6267dd78539863a5ec75b6cadba39184a2efc9b5 (patch) | |
| tree | 9843465f180c8b0c3ade9701dd9cf7e1afd96eae /source4/heimdal | |
| parent | 640792fb5841ef03e83e59d8d74d65b6f7203756 (diff) | |
| download | samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.tar.gz samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.tar.bz2 samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.zip | |
Clean up some git merges gone wrong.
(This used to be commit 42eb6b33462228467e65a51bbf624c481802b090)
Diffstat (limited to 'source4/heimdal')
0 files changed, 0 insertions, 0 deletions