diff options
| author | Markus Roberts <Markus@reality.com> | 2010-03-26 17:02:14 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 8465cd08d0e522c8ef871df7d3a5bf216e1d7d59 (patch) | |
| tree | 3f7c5671e128238b2228411d34be8ad6dfdfd2f1 /lib | |
| parent | 0f768ed335424253b8f1f66788a076f451b37170 (diff) | |
| download | puppet-8465cd08d0e522c8ef871df7d3a5bf216e1d7d59.tar.gz puppet-8465cd08d0e522c8ef871df7d3a5bf216e1d7d59.tar.xz puppet-8465cd08d0e522c8ef871df7d3a5bf216e1d7d59.zip | |
Resolving conflicts with reinh:feature/master/single_executable
Puppet is now main, and the variable got renamed to reflect that.
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions