summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2018-08-08 10:30:28 -0400
committerJoey Hess2018-08-08 10:30:28 -0400
commit11716961086b4d7dd81d5af57b753223c3a591cd (patch)
treec07c08fdb9bcb5f5789a54da37f78bec385b648a /config.hs
parent732bab20d917c0625c43bdce015a0720a39758e1 (diff)
parentf90605a0f5ef0fe2946a81f20eea9abec801a4c6 (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