diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-19 10:59:29 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-19 10:59:29 -0700 |
| commit | 7438723f6ae13605a48c5db63839a829a19f5127 (patch) | |
| tree | 723eaa606df756ae160c3f8512ccb6d5f5c0ee3d /lib/puppet/interface/documentation.rb | |
| parent | a594563919a2342e1ea542f8f18ed187ab9ecad3 (diff) | |
| parent | 0fed94fbbad45388c1f9d2451d946681d80643f8 (diff) | |
| download | puppet-7438723f6ae13605a48c5db63839a829a19f5127.tar.gz puppet-7438723f6ae13605a48c5db63839a829a19f5127.tar.xz puppet-7438723f6ae13605a48c5db63839a829a19f5127.zip | |
Merge branch 'bug/2.7.x/6752-allow-action-specific-render-methods'
Fix the conflicts over changes in my previous commit.
Diffstat (limited to 'lib/puppet/interface/documentation.rb')
0 files changed, 0 insertions, 0 deletions