summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-04-30 15:45:08 -0400
committerJoey Hess2016-04-30 15:45:08 -0400
commitfa75241024cc600390f36eba2c116f7110ab504f (patch)
tree01b8fd9e7ec0120544caed6a22e55fdd1db9f04d /config.hs
parent2e513dc98c51eca1cdfce3715b4a017be39734f7 (diff)
parent9adfb7560fcd1186153bd743f885c12753abc9e5 (diff)
Merge remote-tracking branch 'felix/attic' into joeyconfig
Diffstat (limited to 'config.hs')
l---------config.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file