diff options
author | Micah Anderson <micah@riseup.net> | 2012-06-20 13:39:20 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2012-06-20 13:39:20 -0400 |
commit | 475d93888ff853d48b6f4cdcc894415026553abe (patch) | |
tree | 206039e5e8acbf15be4900e8f5594bc47c3d2169 /manifests/rules/torify | |
parent | d3eb5ffc325bd13e103dc72143f78c050e149d29 (diff) | |
download | puppet-shorewall-475d93888ff853d48b6f4cdcc894415026553abe.tar.gz puppet-shorewall-475d93888ff853d48b6f4cdcc894415026553abe.tar.bz2 |
fixup some merge gaffs
Diffstat (limited to 'manifests/rules/torify')
0 files changed, 0 insertions, 0 deletions