]> git.sur5r.net Git - bacula/bacula/commit
Fix merge conflict leftover
authorMarco van Wieringen <mvw@planets.elm.net>
Fri, 14 Aug 2009 15:35:04 +0000 (17:35 +0200)
committerKern Sibbald <kern@sibbald.com>
Sat, 15 Aug 2009 05:36:32 +0000 (07:36 +0200)
commit50d31708a6d6fc8143ae2348ef3adb501b04c16d
tree003c926617e703261b8ed641060de0f35ca52193
parent3526af329777db0a1ad0ceb584e5cbe702d08ba5
Fix merge conflict leftover
bacula/src/filed/xattr.c