[src/pgoyette-localcount]: src/sys/arch/x86/x86 Resolve $NetBSD$ conflict

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

details:   https://anonhg.NetBSD.org/src/rev/c555966b1760
branches:  pgoyette-localcount
changeset: 852897:c555966b1760
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sat Aug 06 10:45:22 2016 +0000

description:
Resolve $NetBSD$ conflict

diffstat:

 sys/arch/x86/x86/pmap.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r d1edfec3e8d0 -r c555966b1760 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Sat Aug 06 00:18:38 2016 +0000
+++ b/sys/arch/x86/x86/pmap.c   Sat Aug 06 10:45:22 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.211.2.2 2016/08/06 00:19:06 pgoyette Exp $  */
+/*     $NetBSD: pmap.c,v 1.211.2.3 2016/08/06 10:45:22 pgoyette Exp $  */
 
 /*-
  * Copyright (c) 2008, 2010, 2016 The NetBSD Foundation, Inc.
@@ -171,11 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-<<<<<<< pmap.c
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.2 2016/08/06 00:19:06 pgoyette Exp $");
-=======
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.2 2016/08/06 00:19:06 pgoyette Exp $");
->>>>>>> 1.218
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.3 2016/08/06 10:45:22 pgoyette Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"