summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-11-06 11:14:28 +0100
committervarac <varacanero@zeromail.org>2012-11-06 11:14:28 +0100
commitb08f959aa17f05821a6a4a58266b9250cdc59cbb (patch)
tree9ea7c7eb5abd913ccbcb2f7f97bff8e48851c474 /puppet/modules/site_config
parent1493ca871a596380f3db6feeb2c0621a597d4f30 (diff)
fixed unseen merge conflicts
Diffstat (limited to 'puppet/modules/site_config')
0 files changed, 0 insertions, 0 deletions