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_prot.h | |
| parent | 4b109a080d8618ef145e3a1ac1665ac19b50d1be (diff) | |
| download | FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.zip FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'include/rpcsvc/yp_prot.h')
| -rw-r--r-- | include/rpcsvc/yp_prot.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h index a518e64..df6ba75 100644 --- a/include/rpcsvc/yp_prot.h +++ b/include/rpcsvc/yp_prot.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: yp_prot.h,v 1.7 1997/05/07 02:27:17 eivind Exp $ + * $Id: yp_prot.h,v 1.4 1996/12/30 14:01:08 peter Exp $ */ #ifndef _RPCSVC_YP_PROT_H_ |
