Fixes merge conflicts
This commit is contained in:
		
							parent
							
								
									0eb60eb187
								
							
						
					
					
						commit
						0a845c7097
					
				
					 1 changed files with 2 additions and 1 deletions
				
			
		|  | @ -20,3 +20,4 @@ enable_sudo: yes | ||||||
| enable_passwordless_sudo: yes | enable_passwordless_sudo: yes | ||||||
| # Skip provisioning of the firewall | # Skip provisioning of the firewall | ||||||
| skip_firewall: no | skip_firewall: no | ||||||
|  | authorized_keys_are_exclusive: false # Be careful, this will delete non-Ansible-managed authorized keys from the target! | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue