aboutsummaryrefslogtreecommitdiff
path: root/files/boilerplate/stopped.header
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-06-20 13:39:20 -0400
committerMicah Anderson <micah@riseup.net>2012-06-20 13:39:20 -0400
commit475d93888ff853d48b6f4cdcc894415026553abe (patch)
tree206039e5e8acbf15be4900e8f5594bc47c3d2169 /files/boilerplate/stopped.header
parentd3eb5ffc325bd13e103dc72143f78c050e149d29 (diff)
downloadpuppet-shorewall-475d93888ff853d48b6f4cdcc894415026553abe.tar.gz
puppet-shorewall-475d93888ff853d48b6f4cdcc894415026553abe.tar.bz2
fixup some merge gaffs
Diffstat (limited to 'files/boilerplate/stopped.header')
0 files changed, 0 insertions, 0 deletions