diff options
author | Adrien Thebo <git@somethingsinistral.net> | 2013-05-15 10:58:04 -0700 |
---|---|---|
committer | Adrien Thebo <git@somethingsinistral.net> | 2013-05-15 10:58:04 -0700 |
commit | dad3a2948fb9ebc5c45975340bc8796c9c041d9a (patch) | |
tree | ec211cd78e4b7f01d4ef52f2cc488258d60899f2 /lib/puppet/parser/functions/strftime.rb | |
parent | 1ffd72daaaf21e71e762b6cd543043680bdb6694 (diff) | |
parent | b975bd66aa7345a5eeb54eb79dd0f708934609f8 (diff) | |
download | puppet-stdlib-dad3a2948fb9ebc5c45975340bc8796c9c041d9a.tar.gz puppet-stdlib-dad3a2948fb9ebc5c45975340bc8796c9c041d9a.tar.bz2 |
Merge pull request #147 from mhellmic/master
don't fail on undef variable in merge
Diffstat (limited to 'lib/puppet/parser/functions/strftime.rb')
0 files changed, 0 insertions, 0 deletions