Commit 55578873 authored by Shawn Webb's avatar Shawn Webb
Browse files

HBSD: Resolve merge conflict


Signed-off-by: Shawn Webb's avatarShawn Webb <shawn.webb@hardenedbsd.org>
parent f10ee2b6
......@@ -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 \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment