hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-24 17:44:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

HBSD: Resolve merge conflict

Browse Source 
Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
This commit is contained in:
Shawn Webb 2024-08-27 00:19:07 +00:00
parent ad83a99002
commit 3ed35b9336
No known key found for this signature in database
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/packages/generate-ucl.sh
View File

@ -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}"
}