source-changes: CVS commit: [simonb-timecounters] src/sys/compat/netbsd32

Subject: CVS commit: [simonb-timecounters] src/sys/compat/netbsd32
To: None <source-changes@NetBSD.org>
From: Matthias Drochner <drochner@netbsd.org>
List: source-changes
Date: 06/02/2006 17:00:07

Module Name:	src
Committed By:	drochner
Date:		Fri Jun  2 17:00:07 UTC 2006

Modified Files:
	src/sys/compat/netbsd32 [simonb-timecounters]: netbsd32_time.c

Log Message:
remove a leftover CVS conflict marker


To generate a diff of this commit:
cvs rdiff -r1.18.6.3 -r1.18.6.4 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.