summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/ast/function.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-07-08 15:03:13 -0500
committerLuke Kanies <luke@madstop.com>2008-07-08 15:03:13 -0500
commitc1dc92b9a14c04096e0bed0f2c4acc4dfe1ed7d2 (patch)
treeb3269b4e76edbcb3458fcdf1832421fb11e57890 /lib/puppet/parser/ast/function.rb
parentb0febd263c0cb8e61d512898f7c79868ea77e619 (diff)
parentedf99c508dabb58342eeff251ad5701d2755426d (diff)
downloadpuppet-c1dc92b9a14c04096e0bed0f2c4acc4dfe1ed7d2.tar.gz
puppet-c1dc92b9a14c04096e0bed0f2c4acc4dfe1ed7d2.tar.xz
puppet-c1dc92b9a14c04096e0bed0f2c4acc4dfe1ed7d2.zip
Merge branch '0.24.x'
Conflicts: CHANGELOG
Diffstat (limited to 'lib/puppet/parser/ast/function.rb')
-rw-r--r--lib/puppet/parser/ast/function.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/ast/function.rb b/lib/puppet/parser/ast/function.rb
index 63d7c7abf..eb36fa906 100644
--- a/lib/puppet/parser/ast/function.rb
+++ b/lib/puppet/parser/ast/function.rb
@@ -42,7 +42,7 @@ class Puppet::Parser::AST
raise Puppet::DevError, "Invalid function type %s" % @ftype.inspect
end
- # Lastly, check the arity
+ # Lastly, check the parity
end
end
end