Fix fce merge conflict
authorFrank Lahm <franklahm@googlemail.com>
Tue, 24 May 2011 12:32:02 +0000 (14:32 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 24 May 2011 12:32:02 +0000 (14:32 +0200)
commit5116ed2346ea7ee6e5a9858dee94f3eacdc00d7e
tree5b8e5b41b71088fe1774a3f3a36d57e6662beec2
parentcc5fb7fd9d648f38a8cb9e22e2c703e657e1ba6a
parent33f44ea7f93b30678659d7e50b23c5056991dfd0
Fix fce merge conflict
etc/afpd/afp_options.c
etc/afpd/directory.c
etc/afpd/file.c
etc/afpd/filedir.c
etc/afpd/fork.c
etc/afpd/fork.h
etc/afpd/ofork.c