summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2017-07-17 16:51:00 -0400
committerJoey Hess2017-07-17 16:51:00 -0400
commit7e53d16aa18f343de70830219095fbf8e1566a2f (patch)
treeb31044c089a6099a7b2ebfed27c3de6a21085f93 /config.hs
parente2792f93555c0d35313c976604c4ee20f3dd36e2 (diff)
parentc987a3a3bd14171071b85c5937773a47b23859ff (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