Module Name: src Committed By: oster Date: Sun Jan 27 04:17:39 UTC 2019
Modified Files: src/sys/external/bsd/gnu-efi/dist/lib: print.c Log Message: Fix merge issue. (leftover line) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/gnu-efi/dist/lib/print.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/gnu-efi/dist/lib/print.c diff -u src/sys/external/bsd/gnu-efi/dist/lib/print.c:1.3 src/sys/external/bsd/gnu-efi/dist/lib/print.c:1.4 --- src/sys/external/bsd/gnu-efi/dist/lib/print.c:1.3 Sun Jan 27 02:08:43 2019 +++ src/sys/external/bsd/gnu-efi/dist/lib/print.c Sun Jan 27 04:17:39 2019 @@ -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 @@ Returns: _PoolCatPrint (fmt, args, &spc, _PoolPrint); return spc.str; } ->>>>>>> 1.1.1.1.34.1 CHAR16 * PoolPrint (