]> arthur.barton.de Git - netatalk.git/commit
Fix merge conflict
authorFrank Lahm <franklahm@googlemail.com>
Sat, 16 Apr 2011 14:42:16 +0000 (16:42 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 16 Apr 2011 14:42:16 +0000 (16:42 +0200)
commit06b7f576daa4a127964febf210869f4729235dc3
tree40ed98dd7aefd326060cc74dc8ccab1e8df85df6
parentabe2e8f803429c7349dff2486e36c6e0e3859448
parent6fb54052721880f8ee01aeee820c329dcf4d5963
Fix merge conflict
etc/cnid_dbd/cmd_dbd.c