From 8722df25de12bc79923149bf6208cd0fca2c144b Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Mon, 3 Oct 2016 11:45:57 -0400
Subject: fixing test.yml

---
 test.yml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'test.yml')

diff --git a/test.yml b/test.yml
index 8969829..e15f798 100644
--- a/test.yml
+++ b/test.yml
@@ -5,16 +5,8 @@
   roles:
     - sudo
   vars:
-<<<<<<< HEAD
     sudo_strings:
       - { priority: 42, exists: 'false', name: 'admins-do-all', content: 'User_Alias ADMINS = bgstack15, bgstack15, user16, user16' }
       - { priority: 43, exists: false, name: 'a', content: "ADMINS ALL=(ALL)  ALL" }
     sudo_files:
       - { exists: 'false', file: '../../../company/sudo-files/40_bgstack15' }
-=======
-    sudo_strings
-      - { priority: 40, name: 'admins-do-all', content: 'User_Alias ADMINS = bgstack15, bgstack15, user16, user16' }
-      - { priority: 41, name: 'a', content: 'ADMINS ALL=(ALL)  ALL' }
-    sudo_files
-      - { file: '../../../company/sudo-files/40_bgstack15' }
->>>>>>> 4db266d0ec2f78079c8ff271cdb2e78230d3b090
-- 
cgit