diff options
| -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 |