summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-05-29 15:03:29 -0400
committerJoey Hess2016-05-29 15:03:29 -0400
commit44de63e0cfbfda89035c47a71c785f52f72aa6ad (patch)
tree9f4415dc8fdfa7660e2de321cf2dd5624e00c464 /config.hs
parent55fc89ab22fc47b7a8bedff7c303e93348024bf1 (diff)
parenta52f7a546def6685be8dba5d7145b1f50aaa35d2 (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