Resolve conflict

This commit is contained in:
Brian Behlendorf 2008-12-12 14:22:23 -08:00
commit e0db7f116d
1 changed files with 1 additions and 1 deletions

View File

@ -1 +1 @@
SUBDIRS = libspl libavl libnvpair libuutil libzpool libzfs
SUBDIRS = libspl libavl libnvpair libuutil libzfs # libzpool