Ubuntu: Remove a merge marker
I committed this accidentally.
parent
b9ce522b6d
commit
1d73801d3d
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue