]> 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)
committerMarco van Wieringen <mvw@planets.elm.net>
Fri, 14 Aug 2009 15:35:04 +0000 (17:35 +0200)
commitd3c597f9af57d67fba98f310ccdf56e1d19a6ee2
treed483d77fa2f4b2f81179ca5669bda98ac09de695
parent1d59662f06b3a3224f65b73eff888ea03c79e966
Fix merge conflict leftover
bacula/src/filed/xattr.c