Merge

2021-11-22 12:13:31 +01:00 · 2021-11-22 12:13:31 +01:00 · 66cdd276c2
commit 66cdd276c2
parent 7b1197b4f5
1 changed files with 0 additions and 6 deletions
--- a/create_aws_wireguard_server.yml
+++ b/create_aws_wireguard_server.yml
@ -33,11 +33,5 @@
 - name: include playbook for pihole
  import_playbook: pihole.yml

-<<<<<<< HEAD
- name: Include playbook to install wireguard
-  import_playbook: wireguard.yml
-
-=======
 - name: include playbook for wireguard server
  import_playbook: wireguard_pihole_only.yml
->>>>>>> 268d550 (Checkin der ewig schon herumliegenden Daten, keine Ahnung mehr was ich)