[src/trunk]: src/sys/external/bsd/gnu-efi/dist/lib Fix merge issue. (leftover...

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

details:   https://anonhg.NetBSD.org/src/rev/624fd3084be4
branches:  trunk
changeset: 838653:624fd3084be4
user:      oster <oster%NetBSD.org@localhost>
date:      Sun Jan 27 04:17:39 2019 +0000

description:
Fix merge issue. (leftover line)

diffstat:

 sys/external/bsd/gnu-efi/dist/lib/print.c |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 1bead96e5fd4 -r 624fd3084be4 sys/external/bsd/gnu-efi/dist/lib/print.c
--- a/sys/external/bsd/gnu-efi/dist/lib/print.c Sun Jan 27 04:15:11 2019 +0000
+++ b/sys/external/bsd/gnu-efi/dist/lib/print.c Sun Jan 27 04:17:39 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: print.c,v 1.3 2019/01/27 02:08:43 pgoyette Exp $       */
+/*     $NetBSD: print.c,v 1.4 2019/01/27 04:17:39 oster Exp $  */
 
 /*++
 
@@ -532,7 +532,6 @@
     _PoolCatPrint (fmt, args, &spc, _PoolPrint);
     return spc.str;
 }
->>>>>>> 1.1.1.1.34.1
 
 CHAR16 *
 PoolPrint (