herp
This commit is contained in:
parent
41c335b967
commit
50441346d3
1 changed files with 0 additions and 4 deletions
|
@ -1,8 +1,4 @@
|
|||
---
|
||||
<<<<<<< HEAD
|
||||
# testing changes 2
|
||||
=======
|
||||
>>>>>>> upstream/master
|
||||
- name: "Set up a Matrix server"
|
||||
hosts: "{{ target if target is defined else 'matrix_servers' }}"
|
||||
become: true
|
||||
|
|
Loading…
Add table
Reference in a new issue