Resolve conflict
This commit is contained in:
commit
1bbe898289
|
@ -1 +1 @@
|
||||||
SUBDIRS = libspl libavl libnvpair libuutil libzpool libzfs
|
SUBDIRS = libspl libavl libnvpair libuutil libzfs # libzpool
|
||||||
|
|
Loading…
Reference in New Issue