diff options
| author | Markus Roberts <Markus@reality.com> | 2010-06-27 10:49:29 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-06-27 10:49:29 -0700 |
| commit | d62a391695bd68464ba7345616cc1e7686f8f735 (patch) | |
| tree | 1feb001ef1e0ee72ca2c86f0df10beb5626fcc8b /lib/puppet/application | |
| parent | b4af2380f45a68830e47c8995b10474f512e67a4 (diff) | |
| download | puppet-d62a391695bd68464ba7345616cc1e7686f8f735.tar.gz puppet-d62a391695bd68464ba7345616cc1e7686f8f735.tar.xz puppet-d62a391695bd68464ba7345616cc1e7686f8f735.zip | |
Breaking require-loop
Merging some of the branches creates a require-loop; this commit breaks it by
removing the most recently added link (which I believe to have been unneeded /
unrelated to the patch in which it snuck in).
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/agent.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index c82491de8..f0693f94b 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -1,4 +1,3 @@ -require 'puppet' require 'puppet/application' class Puppet::Application::Agent < Puppet::Application |