[src/nathanw_sa]: src/sys/dev/pci Remove CVS conflicts.

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

details:   https://anonhg.NetBSD.org/src/rev/a07c19a67dec
branches:  nathanw_sa
changeset: 506279:a07c19a67dec
user:      gmcgarry <gmcgarry%NetBSD.org@localhost>
date:      Sat Oct 05 04:59:46 2002 +0000

description:
Remove CVS conflicts.

diffstat:

 sys/dev/pci/if_wi_pci.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r 484dcf30ab8a -r a07c19a67dec sys/dev/pci/if_wi_pci.c
--- a/sys/dev/pci/if_wi_pci.c   Sat Oct 05 04:54:24 2002 +0000
+++ b/sys/dev/pci/if_wi_pci.c   Sat Oct 05 04:59:46 2002 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_wi_pci.c,v 1.1.2.6 2002/09/23 15:42:20 thorpej Exp $  */
+/*      $NetBSD: if_wi_pci.c,v 1.1.2.7 2002/10/05 04:59:46 gmcgarry Exp $  */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -43,11 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-<<<<<<< if_wi_pci.c
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.1.2.6 2002/09/23 15:42:20 thorpej Exp $");
-=======
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.1.2.6 2002/09/23 15:42:20 thorpej Exp $");
->>>>>>> 1.8
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.1.2.7 2002/10/05 04:59:46 gmcgarry Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>