[src/ktrace-lwp]: src/sys/arch/i386/conf Oops. Merge botch.

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a8f032ccd24c
branches:  ktrace-lwp
changeset: 548949:a8f032ccd24c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Mar 07 08:00:09 2005 +0000

description:
Oops. Merge botch.

diffstat:

 sys/arch/i386/conf/NET4501 |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r d53842f1303a -r a8f032ccd24c sys/arch/i386/conf/NET4501
--- a/sys/arch/i386/conf/NET4501        Fri Mar 04 16:49:38 2005 +0000
+++ b/sys/arch/i386/conf/NET4501        Mon Mar 07 08:00:09 2005 +0000
@@ -1,5 +1,5 @@
+# $NetBSD: NET4501,v 1.20.2.9 2005/03/07 08:00:09 skrll Exp $
 #
->>>>>>> 1.33
 # NET4501 -- kernel configuration for a Soekris Engineering net4501
 # single-board computer.
 #
@@ -10,7 +10,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "NET4501-$Revision: 1.20.2.8 $"
+#ident                 "NET4501-$Revision: 1.20.2.9 $"
 
 maxusers       32              # estimated number of users