Commit 792d9424 authored by Shawn Webb's avatar Shawn Webb
Browse files

HBSD: Resolve merge conflict


Signed-off-by: Shawn Webb's avatarShawn Webb <shawn.webb@hardenedbsd.org>
parent bd38a952
......@@ -22,11 +22,6 @@
/*
* Copyright (c) 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
*/
<<<<<<< HEAD
#include <os/freebsd/zfs/sys/zfs_ioctl_compat.h>
#include <jail.h>
=======
>>>>>>> origin/freebsd/current/main
#include "../../libzfs_impl.h"
#include <libzfs.h>
#include <libzutil.h>
......@@ -36,6 +31,7 @@
#include <sys/module.h>
#include <sys/stat.h>
#include <sys/param.h>
#include <jail.h>
#ifdef IN_BASE
#define ZFS_KMOD "zfs"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment