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/ypxfrd.x | |
parent | 4b109a080d8618ef145e3a1ac1665ac19b50d1be (diff) | |
download | FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.zip FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.tar.gz |
Resolve conflicts.
Diffstat (limited to 'include/rpcsvc/ypxfrd.x')
-rw-r--r-- | include/rpcsvc/ypxfrd.x | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x index f9aba45..f51a1b9 100644 --- a/include/rpcsvc/ypxfrd.x +++ b/include/rpcsvc/ypxfrd.x @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ypxfrd.x,v 1.2 1996/07/04 02:08:17 wpaul Exp $ */ /* @@ -68,7 +68,7 @@ #ifndef RPC_HDR %#ifndef lint -%static const char rcsid[] = "$Id$"; +%static const char rcsid[] = "$Id: ypxfrd.x,v 1.2 1996/07/04 02:08:17 wpaul Exp $"; %#endif /* not lint */ #endif |