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