diff options
| author | B Stack <bgstack15@gmail.com> | 2016-10-03 11:45:57 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2016-10-03 11:45:57 -0400 |
| commit | 8722df25de12bc79923149bf6208cd0fca2c144b (patch) | |
| tree | ab53ddc68219e3d56cbdedbd1ce719ea17bad29f /test.yml | |
| parent | Merge https://github.com/bgstack15/ansible01 (diff) | |
| download | ansible01-8722df25de12bc79923149bf6208cd0fca2c144b.tar.gz ansible01-8722df25de12bc79923149bf6208cd0fca2c144b.tar.bz2 ansible01-8722df25de12bc79923149bf6208cd0fca2c144b.zip | |
fixing test.yml
Diffstat (limited to 'test.yml')
| -rw-r--r-- | test.yml | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -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 |