summaryrefslogtreecommitdiffstats
path: root/include/rpc/rpc_msg.h
diff options
context:
space:
mode:
authorwpaul <wpaul@FreeBSD.org>1997-05-28 04:45:15 +0000
committerwpaul <wpaul@FreeBSD.org>1997-05-28 04:45:15 +0000
commitdb46899f5a13e95008c91bac22a351084b5cd7d1 (patch)
tree5fd284f478e045e9701e047bb8b1dbb0417a483f /include/rpc/rpc_msg.h
parent3be3c101574f9fe0620458248e957eda1de7b9a9 (diff)
downloadFreeBSD-src-db46899f5a13e95008c91bac22a351084b5cd7d1.zip
FreeBSD-src-db46899f5a13e95008c91bac22a351084b5cd7d1.tar.gz
Resolve conflicts.
Diffstat (limited to 'include/rpc/rpc_msg.h')
-rw-r--r--include/rpc/rpc_msg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 7b8c205..8005dc8 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -28,7 +28,7 @@
*
* from: @(#)rpc_msg.h 1.7 86/07/16 SMI
* from: @(#)rpc_msg.h 2.1 88/07/29 4.0 RPCSRC
- * $Id: rpc_msg.h,v 1.9 1997/05/07 02:27:09 eivind Exp $
+ * $Id: rpc_msg.h,v 1.6 1996/12/30 13:59:39 peter Exp $
*/
/*
OpenPOWER on IntegriCloud