From: Marco van Wieringen <mvw@planets.elm.net>
Date: Fri, 14 Aug 2009 15:35:04 +0000 (+0200)
Subject: Fix merge conflict leftover
X-Git-Tag: Release-5.0.0~332^2~35
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=50d31708a6d6fc8143ae2348ef3adb501b04c16d;p=bacula%2Fbacula

Fix merge conflict leftover
---

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)