Module Name:	basesrc
Committed By:	christos
Date:		Wed Aug 25 03:00:12 UTC 1999

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

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 basesrc/usr.sbin/pppd/pppstats/pppstats.8
cvs rdiff -r1.21 -r1.22 basesrc/usr.sbin/pppd/pppstats/pppstats.c

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