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/sm_inter.x | |
parent | 4b109a080d8618ef145e3a1ac1665ac19b50d1be (diff) | |
download | FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.zip FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.tar.gz |
Resolve conflicts.
Diffstat (limited to 'include/rpcsvc/sm_inter.x')
-rw-r--r-- | include/rpcsvc/sm_inter.x | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index b29529e..49a9304 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -37,7 +37,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)sm_inter.x 2.2 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: sm_inter.x,v 1.1 1994/08/04 19:01:53 wollman Exp $"; %#endif /* not lint */ #endif |