From 3ed35b9336df9543a4285adbe5a1411d1a2a737a Mon Sep 17 00:00:00 2001
From: Shawn Webb <shawn.webb@hardenedbsd.org>
Date: Tue, 27 Aug 2024 00:19:07 +0000
Subject: [PATCH] HBSD: Resolve merge conflict

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
---
 release/packages/generate-ucl.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 5f8626d43642..72db4a3180b8 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -136,11 +136,7 @@ main() {
 		echo 'deps: {' >> ${uclfile}
 		for dep in ${pkgdeps}; do
 			cat <<EOF >> ${uclfile}
-<<<<<<< HEAD
-	%PKG_NAME_PREFIX%-${dep}: {
-=======
 	${PKG_NAME_PREFIX}-${dep}: {
->>>>>>> internal/freebsd/current/main
 		origin: "base",
 		version: "${PKG_VERSION}"
 	}