Module Name:	basesrc
Committed By:	christos
Date:		Wed Aug 25 02:52:16 UTC 1999

Modified Files:
	basesrc/usr.sbin/pppd/chat: chat.8 chat.c

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 basesrc/usr.sbin/pppd/chat/chat.8
cvs rdiff -r1.16 -r1.17 basesrc/usr.sbin/pppd/chat/chat.c

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