[src-draft/trunk]: src/sys/net80211 Resolve conflict (how did that escape?)

[Martin Husemann <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/a38fb7769c10
branches:  trunk
changeset: 935693:a38fb7769c10
user:      Martin Husemann <martin%NetBSD.org@localhost>
date:      Tue Apr 28 20:19:35 2020 +0200

description:
Resolve conflict (how did that escape?)

diffstat:

 sys/net80211/ieee80211_ioctl.c |  8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diffs (24 lines):

diff -r df1eaa465ba7 -r a38fb7769c10 sys/net80211/ieee80211_ioctl.c
--- a/sys/net80211/ieee80211_ioctl.c    Mon Apr 27 07:37:01 2020 +0000
+++ b/sys/net80211/ieee80211_ioctl.c    Tue Apr 28 20:19:35 2020 +0200
@@ -1,8 +1,4 @@
-<<<<<<< /home/martin/wifi/sys/net80211/ieee80211_ioctl.c
-/*     $NetBSD: ieee80211_ioctl.c,v 1.67 2019/11/10 21:16:38 chs Exp $ */
-=======
 /*     $NetBSD: ieee80211_ioctl.c,v 1.60.18.10 2020/04/27 07:45:57 nat Exp $   */
->>>>>>> /tmp/ieee80211_ioctl~other.64lkr62w.c
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -37,11 +33,7 @@
 __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 331797 2018-03-30 18:50:13Z brooks $");
 #endif
 #ifdef __NetBSD__
-<<<<<<< /home/martin/wifi/sys/net80211/ieee80211_ioctl.c
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.67 2019/11/10 21:16:38 chs Exp $");
-=======
 __KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60.18.10 2020/04/27 07:45:57 nat Exp $");
->>>>>>> /tmp/ieee80211_ioctl~other.64lkr62w.c
 #endif
 
 /*