diff options
author | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:38:30 +0000 |
---|---|---|
committer | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:38:30 +0000 |
commit | fd6d99f49e14785b3c84eaf12c9ae787ee93700d (patch) | |
tree | e1853e38f0b1243daa3c8d027f2bf1aff3adaac8 /include/rpcsvc/yp.x | |
parent | 4b109a080d8618ef145e3a1ac1665ac19b50d1be (diff) | |
download | FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.zip FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.tar.gz |
Resolve conflicts.
Diffstat (limited to 'include/rpcsvc/yp.x')
-rw-r--r-- | include/rpcsvc/yp.x | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index 692d0eb..ce5bcf2 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -34,7 +34,7 @@ #ifndef RPC_HDR %#ifndef lint %/*static char sccsid[] = "from: @(#)yp.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: yp.x,v 1.5 1996/02/26 02:22:53 wpaul Exp $"; %#endif /* not lint */ #endif |