summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/facter.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/facter.rb b/lib/facter.rb
index b87805a..2e39431 100644
--- a/lib/facter.rb
+++ b/lib/facter.rb
@@ -707,6 +707,7 @@ class Facter
end
Facter.add(:operatingsystemrelease) do
+<<<<<<< HEAD:lib/facter.rb
confine :operatingsystem => %w{CentOS}
setcode do
release = Resolution.exec('rpm -q centos-release')
@@ -737,6 +738,8 @@ class Facter
end
Facter.add(:operatingsystemrelease) do
+=======
+>>>>>>> b3962ef... Fixed ticket #50 - added selinux facts:lib/facter.rb
setcode do Facter[:kernelrelease].value end
end