diff options
| author | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:57:39 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:57:39 +0000 |
| commit | 8cb575428a170ef0f403ba725f8a676d02bc9edf (patch) | |
| tree | 618404965e96751dd5ed363fe4e5d103346d6a5e /lib/libc/xdr/xdr_mem.c | |
| parent | f4e7d55a64c973a242ec625de339499140632652 (diff) | |
| download | FreeBSD-src-8cb575428a170ef0f403ba725f8a676d02bc9edf.zip FreeBSD-src-8cb575428a170ef0f403ba725f8a676d02bc9edf.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'lib/libc/xdr/xdr_mem.c')
| -rw-r--r-- | lib/libc/xdr/xdr_mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c index d41b301..36b9ada 100644 --- a/lib/libc/xdr/xdr_mem.c +++ b/lib/libc/xdr/xdr_mem.c @@ -30,7 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";*/ /*static char *sccsid = "from: @(#)xdr_mem.c 2.1 88/07/29 4.0 RPCSRC";*/ -static char *rcsid = "$Id$"; +static char *rcsid = "$Id: xdr_mem.c,v 1.4 1996/12/30 14:07:09 peter Exp $"; #endif /* |
