HBSD: Resolve merge conflict

Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>
HardenedBSD · Feb 3, 2022 · 79cc221 · 79cc221
1 parent 49fc38d
commit 79cc221
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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} \