From 2ac4256c29f8c92b93b7eee99fede84cd7ef28cb Mon Sep 17 00:00:00 2001
From: Corbin Bartsch <me@cbarts.net>
Date: Sun, 10 Apr 2022 17:27:17 -0400
Subject: [PATCH] Re-fixed template paths

---
 tasks/apache2_template.yaml | 4 ----
 tasks/nginx_template.yaml   | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/tasks/apache2_template.yaml b/tasks/apache2_template.yaml
index b9a8b53..782874f 100644
--- 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
diff --git a/tasks/nginx_template.yaml b/tasks/nginx_template.yaml
index 3507be7..35942d9 100644
--- 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