Merge
This commit is contained in:
parent
7b1197b4f5
commit
66cdd276c2
@ -33,11 +33,5 @@
|
|||||||
- name: include playbook for pihole
|
- name: include playbook for pihole
|
||||||
import_playbook: pihole.yml
|
import_playbook: pihole.yml
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
- name: Include playbook to install wireguard
|
|
||||||
import_playbook: wireguard.yml
|
|
||||||
|
|
||||||
=======
|
|
||||||
- name: include playbook for wireguard server
|
- name: include playbook for wireguard server
|
||||||
import_playbook: wireguard_pihole_only.yml
|
import_playbook: wireguard_pihole_only.yml
|
||||||
>>>>>>> 268d550 (Checkin der ewig schon herumliegenden Daten, keine Ahnung mehr was ich)
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user