[src/pgoyette-compat]: src/sys/dev/usb Missed a $Id$ conflict in the last syn...

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

details:   https://anonhg.NetBSD.org/src/rev/bcb3f6841f46
branches:  pgoyette-compat
changeset: 446176:bcb3f6841f46
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Nov 26 10:43:36 2018 +0000

description:
Missed a $Id$ conflict in the last sync-with-HEAD

diffstat:

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

diffs (22 lines):

diff -r b879e168ccf1 -r bcb3f6841f46 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Mon Nov 26 01:49:54 2018 +0000
+++ b/sys/dev/usb/usbdi.c       Mon Nov 26 10:43:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.175.2.3 2018/11/26 01:52:49 pgoyette Exp $ */
+/*     $NetBSD: usbdi.c,v 1.175.2.4 2018/11/26 10:43:36 pgoyette Exp $ */
 
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,11 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-<<<<<<< usbdi.c
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.175.2.3 2018/11/26 01:52:49 pgoyette Exp $");
-=======
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.175.2.3 2018/11/26 01:52:49 pgoyette Exp $");
->>>>>>> 1.180
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.175.2.4 2018/11/26 10:43:36 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"