diff options
| author | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:45:15 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:45:15 +0000 |
| commit | db46899f5a13e95008c91bac22a351084b5cd7d1 (patch) | |
| tree | 5fd284f478e045e9701e047bb8b1dbb0417a483f /include/rpc/pmap_prot.h | |
| parent | 3be3c101574f9fe0620458248e957eda1de7b9a9 (diff) | |
| download | FreeBSD-src-db46899f5a13e95008c91bac22a351084b5cd7d1.zip FreeBSD-src-db46899f5a13e95008c91bac22a351084b5cd7d1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'include/rpc/pmap_prot.h')
| -rw-r--r-- | include/rpc/pmap_prot.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index 8cf7989..f4f1967 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -28,7 +28,7 @@ * * from: @(#)pmap_prot.h 1.14 88/02/08 SMI * from: @(#)pmap_prot.h 2.1 88/07/29 4.0 RPCSRC - * $Id: pmap_prot.h,v 1.7 1997/05/07 02:27:07 eivind Exp $ + * $Id: pmap_prot.h,v 1.4 1996/01/30 23:32:08 mpp Exp $ */ /* |
