christos
Sat May 17 18:14:31 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/pppd
In directory netbsd1:/var/slash-tmp/cvs-serv22186

Modified Files:
	auth.c cbcp.c ccp.c chap.c chap_ms.c demand.c fsm.c ipcp.c 
	lcp.c main.c options.c patchlevel.h pppd.8 pppd.h sys-bsd.c 
	upap.c 
Log Message:
Resolve conflicts