Subject: CVS commit: src/sys/compat/netbsd32
To: None <>
From: Christos Zoulas <>
List: source-changes
Date: 12/05/2005 15:17:18
Module Name:	src
Committed By:	christos
Date:		Mon Dec  5 15:17:18 UTC 2005

Modified Files:
	src/sys/compat/netbsd32: netbsd32_time.c

Log Message:
remove conflict.

To generate a diff of this commit:
cvs rdiff -r1.16 -r1.17 src/sys/compat/netbsd32/netbsd32_time.c

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