summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2017-11-29 11:45:06 -0400
committerJoey Hess2017-11-29 11:45:06 -0400
commit578ebbf861a074c33050f4fb927f6f88d442947d (patch)
treed3d3787e4c8ee4c1b4f9413174497a09eee8b525 /config.hs
parent3fc6850ee79ecf3e084cf99b19cf695b90a0129b (diff)
parentfbcfa185eb4cb79380a0db0c1772082d5619ba1d (diff)
Merge branch 'master' 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