summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-06-13 16:47:19 -0400
committerJoey Hess2016-06-13 16:47:19 -0400
commitd669831fb93da736ed0d4732d62a2efbed6462ca (patch)
treed535473b78aa6f91d19d88fef3b513678e14999b /config.hs
parentc16e2a3b6347835e1a6b5bb4031ae43d9d960746 (diff)
parentd78e99a1de865de277969f53d0ce45936deebdc3 (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