From dd2b9c2967767b19bcbc33de0e487405c612f59f Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 16 Sep 2022 10:54:04 -0600 Subject: [PATCH] stand: fix mismerge Remove stray line from mismerge of 5d1531d9d4e7. This is no longer needed. Fixes: 5d1531d9d4e7 Sponsored by: Netflix --- stand/common/metadata.c | 1 - 1 file changed, 1 deletion(-) diff --git a/stand/common/metadata.c b/stand/common/metadata.c index fc8857ee089..a69c6d824d4 100644 --- a/stand/common/metadata.c +++ b/stand/common/metadata.c @@ -106,7 +106,6 @@ md_load_dual(char *args, vm_offset_t *modulep, vm_offset_t *dtb, int kern64) }; #endif - align = kern64 ? 8 : 4; howto = md_getboothowto(args); /*