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 /test/language | |
| parent | d0389f4d16efbeccf47d6cd2f1b0854ccb1c88d5 (diff) | |
| download | puppet-7504f1ede94900ab42cd6e9c4ff9c8a5cb9e65ee.tar.gz puppet-7504f1ede94900ab42cd6e9c4ff9c8a5cb9e65ee.tar.xz puppet-7504f1ede94900ab42cd6e9c4ff9c8a5cb9e65ee.zip | |
Resolving conflicts with ???
Diffstat (limited to 'test/language')
| -rwxr-xr-x | test/language/ast.rb | 1 | ||||
| -rwxr-xr-x | test/language/snippets.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/test/language/ast.rb b/test/language/ast.rb index ed11bc16d..209bc9863 100755 --- a/test/language/ast.rb +++ b/test/language/ast.rb @@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' -require 'puppet/parser/interpreter' require 'puppet/parser/parser' require 'puppettest/resourcetesting' require 'puppettest/parsertesting' diff --git a/test/language/snippets.rb b/test/language/snippets.rb index bfd0e539c..bd0d34872 100755 --- a/test/language/snippets.rb +++ b/test/language/snippets.rb @@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' -require 'puppet/parser/interpreter' require 'puppet/parser/parser' require 'puppet/network/client' require 'puppet/network/handler' |