summaryrefslogtreecommitdiff
path: root/examples/ansible.cfg
diff options
context:
space:
mode:
Diffstat (limited to 'examples/ansible.cfg')
-rw-r--r--examples/ansible.cfg4
1 files changed, 1 insertions, 3 deletions
diff --git a/examples/ansible.cfg b/examples/ansible.cfg
index 712c70682a..27b302e701 100644
--- a/examples/ansible.cfg
+++ b/examples/ansible.cfg
@@ -10,15 +10,13 @@ hostfile = /etc/ansible/hosts
# location of ansible library, eliminates need to specify --module-path
-<<<<<<< HEAD
library = /usr/share/ansible
-=======
+
# uncomment this to disable SSH key host checking
#host_checking = False
# change this for alternative sudo implementations
sudo_exe = sudo
->>>>>>> 9db4f7a... Makes host key checking the default behavior but can be disabled in ansible.cfg or by environment variable.
# default module name used in /usr/bin/ansible when -m is not specified