HBSD: Resolve merge conflict

Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>

libpkg/private/pkg.h

@@ -924,13 +924,11 @@ void backup_library(struct pkgdb *, struct pkg *, const char *);
 int suggest_arch(struct pkg *, bool);
 int set_attrsat(int fd, const char *path, mode_t perm, uid_t uid, gid_t gid, const struct timespec *ats, const struct timespec *mts);
 
-<<<<<<< HEAD
 /* Filesystem extended attribute support */
 int pkg_archive_extattrs(int, struct archive_entry *);
-=======
+
 struct trigger *triggers_load(bool cleanup_only);
 int triggers_execute(struct trigger *cleanup_triggers);
 void append_touched_file(const char *path);
->>>>>>> 74fd3389a4ee2611603ee8658d2f3b4182ace73e
 
 #endif