summaryrefslogtreecommitdiffstats
path: root/lib/facter.rb
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-02-03 04:45:11 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-02-03 04:45:11 +1100
commit64f9fe9a23460f7afd2d18bce8ef2a46f5e795f6 (patch)
tree0b656b9eab26a11b2f2bfec3a1e1ab62681a95eb /lib/facter.rb
parent2b0679994e73518c767c559fd1541767c2d5bad9 (diff)
downloadfacter-64f9fe9a23460f7afd2d18bce8ef2a46f5e795f6.tar.gz
facter-64f9fe9a23460f7afd2d18bce8ef2a46f5e795f6.tar.xz
facter-64f9fe9a23460f7afd2d18bce8ef2a46f5e795f6.zip
Fixed conflict merge
Diffstat (limited to 'lib/facter.rb')
-rw-r--r--lib/facter.rb3
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