a5e9d61 HBSD: Resolve merge conflict — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

HBSD: Resolve merge conflict

Shawn Webb committed 5 years ago

commit a5e9d61387016a7802e40a825631b2903c961a14
parent d871ad5

1 file changed +1 -4

modified libpkg/Makefile.autosetup

@@ -43,13 +43,10 @@ SRCS= backup.c \

 	pkg_version.c \
 	rcscripts.c \
 	flags.c \
 <<<<<<< HEAD
 	extattr.c
 =======
 	extattr.c \
 	fetch_ssh.c \
 	fetch_libfetch.c \
 	fetch_file.c
 >>>>>>> upstream/master
 LOCAL_CFLAGS=	-I$(top_srcdir)/compat \
 		-I$(top_srcdir)/external/blake2 \