Commit 41694cfe by Edward Zarecor

conflict resolution

parent c277a73f
......@@ -7,5 +7,4 @@
serial: "{{ serial_count }}"
roles:
- common
- aws
- edx_ansible
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment