From 1d73801d3d728357f1235a860a7b9d9831eb5236 Mon Sep 17 00:00:00 2001
From: Richard Laager <rlaager@wiktel.com>
Date: Tue, 27 Sep 2016 16:14:49 -0700
Subject: [PATCH] Ubuntu: Remove a merge marker

I committed this accidentally.
---
 Ubuntu-16.10-Root-on-ZFS.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Ubuntu-16.10-Root-on-ZFS.md b/Ubuntu-16.10-Root-on-ZFS.md
index 50d6d13..044431b 100644
--- a/Ubuntu-16.10-Root-on-ZFS.md
+++ b/Ubuntu-16.10-Root-on-ZFS.md
@@ -69,7 +69,6 @@ Always use the long `/dev/disk/by-id/*` aliases with ZFS.  Using the `/dev/sd*`
 
     # zpool create -o ashift=12 \
           -O atime=off -O canmount=off -O compression=lz4 -O normalization=formD \
-<<<<<<< HEAD
           -O mountpoint=/ -R /mnt \
           rpool /dev/disk/by-id/scsi-SATA_disk1-part1