From 84240c9f28408a66223e5d3f481da53edbc33309 Mon Sep 17 00:00:00 2001 From: Sandra Wills Date: Thu, 8 Oct 2015 21:44:50 -0400 Subject: [PATCH] fixed git conflict with double para --- docsite/rst/intro_inventory.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docsite/rst/intro_inventory.rst b/docsite/rst/intro_inventory.rst index ea361cffd02..6a99a917f15 100644 --- a/docsite/rst/intro_inventory.rst +++ b/docsite/rst/intro_inventory.rst @@ -69,11 +69,7 @@ You can also select the connection type and user on a per host basis:: .. note:: -<<<<<<< HEAD - Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible. -======= Ansible 2.0 has depricated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible. ->>>>>>> 9d27412... note modified a bit, then reviewed/approved by jmartin You can also select the connection type and user on a per host basis: