conflict cleanup

This commit is contained in:
Ansible Admin 2016-04-23 11:53:44 +02:00
parent a2752c6da7
commit bdab900297

View File

@ -9,11 +9,7 @@
user: root user: root
gather_facts: False gather_facts: False
vars: vars:
<<<<<<< HEAD snversion: master_v3.0.9
snversion: master_v3.0.7
=======
snversion: master_v3.0.8
>>>>>>> master
batmanversion: v2015.2 batmanversion: v2015.2
common_required_packages: common_required_packages:
- git - git