diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-02-03 04:45:11 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-02-03 04:45:11 +1100 |
| commit | 64f9fe9a23460f7afd2d18bce8ef2a46f5e795f6 (patch) | |
| tree | 0b656b9eab26a11b2f2bfec3a1e1ab62681a95eb /lib | |
| parent | 2b0679994e73518c767c559fd1541767c2d5bad9 (diff) | |
Fixed conflict merge
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facter.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/facter.rb b/lib/facter.rb index 2e39431..b87805a 100644 --- a/lib/facter.rb +++ b/lib/facter.rb @@ -707,7 +707,6 @@ class Facter end Facter.add(:operatingsystemrelease) do -<<<<<<< HEAD:lib/facter.rb confine :operatingsystem => %w{CentOS} setcode do release = Resolution.exec('rpm -q centos-release') @@ -738,8 +737,6 @@ class Facter end Facter.add(:operatingsystemrelease) do -======= ->>>>>>> b3962ef... Fixed ticket #50 - added selinux facts:lib/facter.rb setcode do Facter[:kernelrelease].value end end |