summaryrefslogtreecommitdiff
path: root/templates/Debian/default
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-03 15:01:44 -0400
committerMicah Anderson <micah@riseup.net>2013-04-03 15:01:44 -0400
commitd7acd567ace308049848733d8f1c801b955974a8 (patch)
tree2d96270a1c428b69f7839ab124064e3c9ebff3c0 /templates/Debian/default
parentc3d3f81b98542b94a013440c81b0942c9c4a82cf (diff)
fix merge conflict error causing the $cluster parameter to go missing
Diffstat (limited to 'templates/Debian/default')
0 files changed, 0 insertions, 0 deletions