From bdab90029705d46a146cec508994aeef78ebd842 Mon Sep 17 00:00:00 2001 From: Ansible Admin Date: Sat, 23 Apr 2016 11:53:44 +0200 Subject: [PATCH] conflict cleanup --- install.sn.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/install.sn.yml b/install.sn.yml index 8f42b3c..5c74ff4 100644 --- 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