Merge

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