diff options
author | Markus Roberts <Markus@reality.com> | 2010-01-07 17:23:31 -0800 |
---|---|---|
committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
commit | 7504f1ede94900ab42cd6e9c4ff9c8a5cb9e65ee (patch) | |
tree | 201452cd2daa12369c5d3fecd9caa3a0a1ad5cc7 /lib/puppet | |
parent | d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5 (diff) | |
download | puppet-7504f1ede94900ab42cd6e9c4ff9c8a5cb9e65ee.tar.gz puppet-7504f1ede94900ab42cd6e9c4ff9c8a5cb9e65ee.tar.xz puppet-7504f1ede94900ab42cd6e9c4ff9c8a5cb9e65ee.zip |
Resolving conflicts with ???
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/resource/type.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index 1a18b4e97..9baf1983e 100644 --- a/lib/puppet/resource/type.rb +++ b/lib/puppet/resource/type.rb @@ -27,7 +27,6 @@ class Puppet::Resource::Type def evaluate_code(resource) # Create a new scope. scope = subscope(resource.scope, resource) - scope.compiler.class_set(name, scope) set_resource_parameters(resource, scope) |