summaryrefslogtreecommitdiff
path: root/spec/acceptance/merge_spec.rb
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2015-04-16 10:48:10 -0700
committerMorgan Haskel <morgan@puppetlabs.com>2015-04-16 10:48:10 -0700
commit8a1d1e2f3425ff8fa1d7e74463ec226df2b968c8 (patch)
tree07a0c9a583059d80dcf9c81e287f74c454804377 /spec/acceptance/merge_spec.rb
parent59b3fb4472c6ceafc6762739e767294054787bd4 (diff)
parentac24e7acc767bce9cc1977f90c798df94292813e (diff)
Merge pull request #314 from amateo/feature/loadyaml_check_file
Check if file exists before loading with loadyaml. If not, return nil
Diffstat (limited to 'spec/acceptance/merge_spec.rb')
0 files changed, 0 insertions, 0 deletions