From 2cb1e1b350fac2c66f9d1cee06d0eb98ec7f07d8 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Fri, 14 Aug 2009 17:35:04 +0200 Subject: [PATCH] Fix merge conflict leftover --- bacula/src/filed/xattr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c index 30ea749e1b..d693477eb2 100644 --- a/bacula/src/filed/xattr.c +++ b/bacula/src/filed/xattr.c @@ -683,7 +683,6 @@ static void flush_xattr_link_cache(JCR *jcr) free(ptr->target); } } ->>>>>>> Add all acl and xattr related variables which are either global or already part of the JCR:bacula/src/filed/xattr.c } #if defined(HAVE_SYS_NVPAIR_H) && defined(_PC_SATTR_ENABLED) -- 2.39.5