diff options
author | Michael Scherer <misc@mageia.org> | 2012-02-10 14:20:01 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-02-10 14:20:01 +0000 |
commit | 13044c786d558912bbebe0718a2c22de2bc13d13 (patch) | |
tree | eb325aedf30e5bbb94c69ce4eb5dcfa4f11c299d /deployment/reports/manifests/ii.pp | |
parent | 1451c5f4861941f56712cb813f0ce0ac5151c741 (diff) | |
download | puppet-13044c786d558912bbebe0718a2c22de2bc13d13.tar puppet-13044c786d558912bbebe0718a2c22de2bc13d13.tar.gz puppet-13044c786d558912bbebe0718a2c22de2bc13d13.tar.bz2 puppet-13044c786d558912bbebe0718a2c22de2bc13d13.tar.xz puppet-13044c786d558912bbebe0718a2c22de2bc13d13.zip |
make sure puppet config is erased by the reference one
in case of conflicts when committing
Diffstat (limited to 'deployment/reports/manifests/ii.pp')
0 files changed, 0 insertions, 0 deletions