CVS commit: src/include

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri May 21 02:26:20 UTC 2004

Modified Files:
        src/include: resolv.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.22 -r1.23 src/include/resolv.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.