diff options
author | Markus Roberts <Markus@reality.com> | 2009-11-23 10:03:47 -0800 |
---|---|---|
committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
commit | 30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3 (patch) | |
tree | 9b92fbc3230024dc65114282f6b601871b141e96 /spec/unit/parser/resource.rb | |
parent | b7015d7610497f113479fad5f360aa5e03a458c5 (diff) | |
download | puppet-30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3.tar.gz puppet-30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3.tar.xz puppet-30f49bb28fd0b2bb771ed3fa75a2d70dbda361f3.zip |
Resolving conflicts with ???
Brice's hash implementation introduces new occurances of SQTEXT/DQTEXT which, with
string interpolation, should simply be STRING.
Diffstat (limited to 'spec/unit/parser/resource.rb')
0 files changed, 0 insertions, 0 deletions