summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRein Henrichs <rein@puppetlabs.com>2010-10-07 10:06:14 -0700
committerRein Henrichs <rein@puppetlabs.com>2010-10-07 10:06:14 -0700
commitf4da5285f1cedfed476eed37d40e1404e2801c48 (patch)
tree0909bc9243c23b3311f4279abca0bc1acdf59654
parentdce8f5727c4b6ee0332500c189775cc7c036e6d0 (diff)
downloadfacter-f4da5285f1cedfed476eed37d40e1404e2801c48.tar.gz
facter-f4da5285f1cedfed476eed37d40e1404e2801c48.tar.xz
facter-f4da5285f1cedfed476eed37d40e1404e2801c48.zip
maint: Fix merge error
-rw-r--r--lib/facter/application.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/facter/application.rb b/lib/facter/application.rb
index 11a29c6..9de9249 100644
--- a/lib/facter/application.rb
+++ b/lib/facter/application.rb
@@ -73,8 +73,6 @@ module Facter
require 'rdoc/ri/ri_paths'
require 'rdoc/usage'
puts RDoc.usage
- ensure
- exit
rescue LoadError
$stderr.puts "No help available unless your RDoc has RDoc.usage"
exit(1)