diff options
| author | Markus Roberts <Markus@reality.com> | 2010-05-21 15:38:06 +0200 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | ba506c199098a4c15024a24d4d58fe50f9e4b57f (patch) | |
| tree | 5d2b68d3272503f130bffe38cf685e1cb3e3f73a /spec/unit/util/autoload.rb | |
| parent | f15a32461dedda250da5c01226d6b35cc36874ce (diff) | |
| download | puppet-ba506c199098a4c15024a24d4d58fe50f9e4b57f.tar.gz puppet-ba506c199098a4c15024a24d4d58fe50f9e4b57f.tar.xz puppet-ba506c199098a4c15024a24d4d58fe50f9e4b57f.zip | |
Resolving conflicts with jes5199:ticket/master/2935-settings-mode
Jesse moved the code David was patching; the conflict resolution omits David's
change (since the code isn't there to be changed) and this moves the change to
the new location.
Diffstat (limited to 'spec/unit/util/autoload.rb')
0 files changed, 0 insertions, 0 deletions