conflict cleanup

2016-04-23 11:53:44 +02:00 · 2016-04-23 11:53:44 +02:00 · bdab900297
commit bdab900297
parent a2752c6da7
1 changed files with 1 additions and 5 deletions
--- a/install.sn.yml
+++ b/install.sn.yml
@ -9,11 +9,7 @@
  user: root
  gather_facts: False
  vars:
-<<<<<<< HEAD
-    snversion: master_v3.0.7
-=======
-    snversion: master_v3.0.8
->>>>>>> master
+    snversion: master_v3.0.9
    batmanversion: v2015.2
    common_required_packages:
      - git