summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/ast/branch.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-08-22 23:34:40 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-08-22 23:34:40 +0000
commit4151fd59ef6490c875140a874c0a13c5d3f311aa (patch)
treeceb265c6fdc52fa46889737263d2d5d8c3819a41 /lib/puppet/parser/ast/branch.rb
parent1b2ee4bb9d9fef44bdf8217f45d6893b7609a432 (diff)
downloadpuppet-4151fd59ef6490c875140a874c0a13c5d3f311aa.tar.gz
puppet-4151fd59ef6490c875140a874c0a13c5d3f311aa.tar.xz
puppet-4151fd59ef6490c875140a874c0a13c5d3f311aa.zip
Committing definition inheritance. I have not yet written tests yet, but my last commit pretty seriously broke some things without me realizing it, so I wanted to get this in.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1484 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/ast/branch.rb')
-rw-r--r--lib/puppet/parser/ast/branch.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/parser/ast/branch.rb b/lib/puppet/parser/ast/branch.rb
index 941c00a68..5a4d323f5 100644
--- a/lib/puppet/parser/ast/branch.rb
+++ b/lib/puppet/parser/ast/branch.rb
@@ -45,3 +45,5 @@ class Puppet::Parser::AST
end
end
end
+
+# $Id$