HBSD: Resolve merge conflict

Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>

HBSD: Resolve merge conflict
Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>
55578873 · Shawn Webb · f10ee2b6 · 55578873
Commit 55578873 authored Oct 21, 2021 by Shawn Webb
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -50,11 +50,8 @@ MAN=	aac.4 \
 	${_aout.4} \
 	${_apic.4} \
 	arcmsr.4 \
-<<<<<<< HEAD
-	aslr.4 \
-=======
 	arswitch.4 \
->>>>>>> origin/freebsd/current/main
+	aslr.4 \
 	${_asmc.4} \
 	at45d.4 \
 	ata.4 \