diff options
| author | Markus Roberts <Markus@reality.com> | 2010-02-06 11:34:16 -0800 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 07cfdd0a5515eac9d7aafb5c3c53070a753630e0 (patch) | |
| tree | 3d50e38a49da3121c270a56fa552c3cbe63295b7 /lib | |
| parent | ad148d63a638c5ae5709463b97a8f70ce1cce607 (diff) | |
| download | puppet-07cfdd0a5515eac9d7aafb5c3c53070a753630e0.tar.gz puppet-07cfdd0a5515eac9d7aafb5c3c53070a753630e0.tar.xz puppet-07cfdd0a5515eac9d7aafb5c3c53070a753630e0.zip | |
Resolving conflicts with jesse:feature/master/3394
Without this change, rake spec crashes with a message about feature being undefined.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/util/settings.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index e3f95d89e..dd85342c0 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -4,7 +4,6 @@ require 'getoptlong' require 'puppet/external/event-loop' require 'puppet/util/cacher' require 'puppet/util/loadedfile' -require 'puppet/resource' # The class for handling configuration files. class Puppet::Util::Settings |