mbr fa2df21e05 Resolve conflicts.

2003-09-02 15:42:57 +00:00

..

nfs_prot_aix5_1.h

…

nfs_prot_darwin.h

…

nfs_prot_freebsd2.h

Resolve conflicts.

2003-09-02 15:42:57 +00:00

nfs_prot_freebsd3.h

Resolve conflicts.

2003-09-02 15:42:57 +00:00

nfs_prot_osf5.h

…

nfs_prot_sunos5_8.h

…