Re-fixed template paths

2022-04-10 17:27:17 -04:00 · 2022-04-10 17:27:17 -04:00 · 2ac4256c29
commit 2ac4256c29
parent c45247efef
2 changed files with 0 additions and 8 deletions
--- a/tasks/apache2_template.yaml
+++ b/tasks/apache2_template.yaml
@ -1,11 +1,7 @@
 ---
 - name: Write directory-based nextcloud.conf file
  ansible.builtin.template:
-<<<<<<< HEAD
-    src: dhcpd.conf.j2
-=======
    src: apache2_directory_nextcloud.conf.j2
->>>>>>> 46b6f98 (Fixed template paths)
    dest: "{{ nextcloud_apache2_config_path }}"
    mode: '0644'
  become: true
--- a/tasks/nginx_template.yaml
+++ b/tasks/nginx_template.yaml
@ -1,11 +1,7 @@
 ---
 - name: Write nginx.conf file
  ansible.builtin.template:
-<<<<<<< HEAD
    src: nginx.conf
-=======
-    src: nginx.conf.j2
->>>>>>> 46b6f98 (Fixed template paths)
    dest: "{{ nextcloud_nginx_config_path }}"
    mode: '0644'
  become: true