diff options
author | assar <assar@FreeBSD.org> | 2001-02-13 16:52:56 +0000 |
---|---|---|
committer | assar <assar@FreeBSD.org> | 2001-02-13 16:52:56 +0000 |
commit | e1ae34cd7eb529ac68cc6fed2f6d240dcde73c7b (patch) | |
tree | cfc4903cd4bd37cedc93bdd80f27c7a0ef96e4cf /sys/kern/subr_disk.c | |
parent | 3a971fe69aad52dfd248901ae796e64a96ae3e37 (diff) | |
download | FreeBSD-src-e1ae34cd7eb529ac68cc6fed2f6d240dcde73c7b.zip FreeBSD-src-e1ae34cd7eb529ac68cc6fed2f6d240dcde73c7b.tar.gz |
fix conflicts in heimdal 0.3e import
Diffstat (limited to 'sys/kern/subr_disk.c')
0 files changed, 0 insertions, 0 deletions