christos
Sat May 17 17:23:07 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/chat
In directory netbsd1:/var/slash-tmp/cvs-serv14819

Modified Files:
	Makefile chat.8 chat.c 
Log Message:
Resolve conflicts


christos
Sat May 17 17:27:54 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/pppstats
In directory netbsd1:/var/slash-tmp/cvs-serv15246

Log Message:
update to 2.3b5

Status:

Vendor Tag:	MACKERRAS
Release Tags:	PPP2_3B5
		
C src/usr.sbin/pppd/pppstats/pppstats.c
C src/usr.sbin/pppd/pppstats/pppstats.8
C src/usr.sbin/pppd/pppstats/Makefile

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/usr.sbin/pppd/pppstats