CVS commit: basesrc

[Simon Burge <simonb%netbsd.org@localhost>]

Module Name:    basesrc
Committed By:   simonb
Date:           Sat Apr 22 15:04:50 UTC 2000

Modified Files:
        basesrc/dist/ntp/ntpdate: ntptimeset.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/dist/ntp/ntpdate/ntptimeset.c

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