]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/afp_dsi.c
Fix merge errors
authorFrank Lahm <franklahm@googlemail.com>
Sat, 18 Aug 2012 10:59:03 +0000 (12:59 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 18 Aug 2012 10:59:03 +0000 (12:59 +0200)
commitac45f66c0cf86ecb2fb057c79d1f1a5afe3a729d
treefcae54b33f8a87e2ed1bcae9bf61cf747f5d42f5
parent1a0e659df8e92fce1a34cc1f9eecbf936fb09694
Fix merge errors
etc/afpd/afp_dsi.c