b9f22d5 HBSD: Resolve merge conflict — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

HBSD: Resolve merge conflict

Shawn Webb committed 5 years ago

commit b9f22d5d50a07f76749d0bafa6e4b82ecfea7cd1
parent b759c48

1 file changed +1 -3

modified 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