]> 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)
commit2cb1e1b350fac2c66f9d1cee06d0eb98ec7f07d8
treeaa3f06d4db1383f903138c98fb48858bccc1f49b
parentef3609cb50edab26c5f2570cd76104966bb4948e
Fix merge conflict leftover
bacula/src/filed/xattr.c