manual merge
This commit is contained in:
@@ -1,12 +1,8 @@
|
||||
---
|
||||
# tasks file for apache_vhost
|
||||
|
||||
<<<<<<< HEAD
|
||||
- include_vars: "{{ ansible_os_family|lower }}.yml"
|
||||
- include_vars: "{{ ansible_os_family}}.yml"
|
||||
tags: always
|
||||
=======
|
||||
- include_vars: "{{ ansible_os_family }}.yml"
|
||||
>>>>>>> certbot
|
||||
|
||||
- name: create dedicated user
|
||||
user:
|
||||
|
||||
Reference in New Issue
Block a user