summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application/config.rb
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-04-13 00:38:53 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-04-13 00:38:53 -0700
commitb060ca7e1594a6ecfd6b1e32933e6a531b08bcf4 (patch)
tree95c35f65addba0d408cb7f5c9e2c5de53724a737 /lib/puppet/application/config.rb
parent941c56a283265cdf5a951ecaae63580b60486c52 (diff)
parentdb11770718c61f9ee3d5fcd703c5c0c7c05227ca (diff)
downloadpuppet-b060ca7e1594a6ecfd6b1e32933e6a531b08bcf4.tar.gz
puppet-b060ca7e1594a6ecfd6b1e32933e6a531b08bcf4.tar.xz
puppet-b060ca7e1594a6ecfd6b1e32933e6a531b08bcf4.zip
Merge branch 'bug/next/7056-use-face-rather-than-faces' into next
Diffstat (limited to 'lib/puppet/application/config.rb')
-rw-r--r--lib/puppet/application/config.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/config.rb b/lib/puppet/application/config.rb
index 41a46c339..a94441e7f 100644
--- a/lib/puppet/application/config.rb
+++ b/lib/puppet/application/config.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/faces_base'
+require 'puppet/application/face_base'
-class Puppet::Application::Config < Puppet::Application::FacesBase
+class Puppet::Application::Config < Puppet::Application::FaceBase
end