diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-03 22:29:05 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-03 22:29:05 -0500 |
| commit | 35718437c40ab4228bd58eabf89728b7d0919e50 (patch) | |
| tree | 9685e3638ec3110599e0d83d876d4738f8667ff2 /lib/puppet/parser/resource | |
| parent | bb3b3cedf4082dc884e41b864fa755057d20e228 (diff) | |
| parent | fd11603fe47668ba72f0d3f2b984174331a0a154 (diff) | |
Merge branch 'master' of ssh://reductivelabs.com/opt/rl/git/puppet
Conflicts:
lib/puppet/defaults.rb
lib/puppet/dsl.rb
Diffstat (limited to 'lib/puppet/parser/resource')
| -rw-r--r-- | lib/puppet/parser/resource/param.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb index 4332bee85..6bde0674e 100644 --- a/lib/puppet/parser/resource/param.rb +++ b/lib/puppet/parser/resource/param.rb @@ -88,4 +88,3 @@ class Puppet::Parser::Resource::Param end end -# $Id$ |