From 79cc22167dac00e2a602887486074e51c7cfe2d0 Mon Sep 17 00:00:00 2001
From: Shawn Webb <shawn.webb@hardenedbsd.org>
Date: Thu, 3 Feb 2022 09:15:25 -0500
Subject: [PATCH] HBSD: Resolve merge conflict

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
---
 Makefile.libcompat | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile.libcompat b/Makefile.libcompat
index 1ec5b8c3e1c3c9..d1ea49a8d5615a 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -27,15 +27,11 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
 		-DNO_CPU_CFLAGS \
 		MK_BOOT=no \
 		MK_CTF=no \
-<<<<<<< HEAD
-		-DNO_LINT \
 		MK_CFI=no \
 		MK_LTOLIB=no \
 		MK_SAFESTACK=no \
 		MK_SPECTREV1_FIX=no \
 		MK_RETPOLINE=no \
-=======
->>>>>>> origin/freebsd/current/main
 		MK_TESTS=no
 LIBCOMPATWMAKE+=	${TIME_ENV} ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
 			OBJTOP=${LIBCOMPAT_OBJTOP} \