]> arthur.barton.de Git - netatalk.git/commit
Fix merge error
authorFrank Lahm <franklahm@googlemail.com>
Fri, 15 Apr 2011 12:29:03 +0000 (14:29 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 15 Apr 2011 12:29:03 +0000 (14:29 +0200)
commit7bd4f56a74640dfd6f6b2dad6df7aaaeb1440730
tree5389368d05ab95a02055ca772807bdfe6ab23229
parent630e099b8bcd83186cf6df8290d0856f9e801c4f
Fix merge error
etc/cnid_dbd/cmd_dbd_scanvol.c