diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-07-26 17:25:45 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-07-26 17:25:45 +0000 |
commit | aa5a399b8c2ad3cd5bfa00e48573d4ed7fc2cc05 (patch) | |
tree | a8b3ecbaddfdef4fcee89934d01950b80b23eac6 /sys/ddb | |
parent | 63ffefc6e49ef3805fa2358aad55722e0a093946 (diff) |
remove merge error which was commited
Diffstat (limited to 'sys/ddb')
0 files changed, 0 insertions, 0 deletions