summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-07-05 16:43:14 -0400
committerJoey Hess2016-07-05 16:43:14 -0400
commit34992dc8b2bf9a1c4990451760bc09480ccbc0b1 (patch)
tree81d72a20b4d9c83d37bbd81157091e1fca41a695 /config.hs
parent770ae96b1578830e1f3399d6ebee344c33b3ebb3 (diff)
parentf82556e0a8e42d954471c150141d3721fabfb2a3 (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