summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-11-11 17:54:40 -0400
committerJoey Hess2016-11-11 17:54:40 -0400
commit4cbcfd3c386efb094b9e21dcb6e32111f9431f84 (patch)
treedb98e39ed645207990d77f8bf49138965f57881e /config.hs
parent2977e6abdf8eb9043fc722f8bb87ef60d42cb579 (diff)
parentdddfbc2f76d1d8be74d34b2d3d90e206d9f001a2 (diff)
Merge branch '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 ec313725..97d90636 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+joeyconfig.hs \ No newline at end of file