CVS commit: src/include/arpa

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

Module Name:    src
Committed By:   christos
Date:           Fri May 21 02:25:10 UTC 2004

Modified Files:
        src/include/arpa: nameser.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.15 -r1.16 src/include/arpa/nameser.h

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