summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2017-11-22 14:42:03 -0400
committerJoey Hess2017-11-22 14:42:03 -0400
commit1ba03e425ca48aa9d9c32861681c9e5b70abe881 (patch)
tree2f162520589c649978a9986e8cce9e2e39c0e96c /config.hs
parent85a6ca99ac40d521b3634af6f4f8c9f8b227a0ff (diff)
parenteebdd018cd4c3054c258eeb7a6b304b263d62a74 (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