git: dd2b9c296776 - main - stand: fix mismerge

From: Warner Losh <imp_at_FreeBSD.org>
Date: Fri, 16 Sep 2022 16:56:41 UTC 
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=dd2b9c2967767b19bcbc33de0e487405c612f59f

commit dd2b9c2967767b19bcbc33de0e487405c612f59f
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-09-16 16:54:04 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-09-16 16:54:04 +0000

    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 fc8857ee089e..a69c6d824d44 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);
 
     /*