From e0d1c70cd1243e91def166160b4d017c69e78144 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Mon, 20 Aug 2018 17:53:37 +0800
Subject: [PATCH] deal with conflict between 2.14 and master

---
 .../networks/infiniband/mlnxofed_ib_install_v2_diskless.rst      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst
index 9c3d8b871..fdbbac82a 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst
@@ -36,7 +36,6 @@ Diskless Installation
                  -p /install/<path-to>/<MLNX_OFED_LINUX.iso> -m --add-kernel-support --without-32bit --without-fw-update --force -end- \
                  -i $1 -n genimage
 
-
 #. Generate the diskless image
 
    Use the ``genimage`` command to generate the diskless image from the osimage definition ::