Commit b9f22d5d authored by Shawn Webb's avatar Shawn Webb
Browse files

HBSD: Resolve merge conflict


Signed-off-by: Shawn Webb's avatarShawn Webb <shawn.webb@hardenedbsd.org>
parent b759c48c
......@@ -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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment