]> 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)
commit88790f9ddbdd77daa24117585d9cbea4a9b8a4a1
tree5b66f38400ff0ce78d59af7833680f796f777eb1
parent440647ac3a95c6c58fa20b265fa07def9d109c34
Fix merge conflict leftover
bacula/src/filed/xattr.c