diff options
author | Josh Cooper <josh@puppetlabs.com> | 2013-10-29 12:01:39 -0700 |
---|---|---|
committer | Josh Cooper <josh@puppetlabs.com> | 2013-10-29 12:01:39 -0700 |
commit | ae4f52e9e5db1a97ad77b159f11fdbd7ddbad3dd (patch) | |
tree | fb9c51c23a3eda8caff8cc3580b5ca45e774a870 /lib/puppet/parser/functions/deep_merge.rb | |
parent | d809a9ef417f64797bb04fd70bc6bc900c2534ee (diff) | |
parent | 57a5c0b3e36e1c01016865c264ca3642f64b5034 (diff) |
Merge branch 'fix-pick-error-typo'
* fix-pick-error-typo:
(Main) fix typo in pick error message
Closes GH-197
Diffstat (limited to 'lib/puppet/parser/functions/deep_merge.rb')
0 files changed, 0 insertions, 0 deletions