christos 88ae7d9d8f Resolve conflicts.

2004-11-07 01:48:01 +00:00

..

ftp.h

…

inet.h

Resolve conflicts.

2004-11-07 01:48:01 +00:00

nameser_compat.h

…

nameser.h

…

telnet.h

…

tftp.h

…