Fix merge conflict leftover

diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c
index 30ea749e1bda648fba4f0d21dba7f5ee33131f25..d693477eb2e64f7b398461228f4aad604f650eca 100644 (file)
--- 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)