summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2018-02-04 11:59:02 -0400
committerJoey Hess2018-02-04 11:59:02 -0400
commitdcae58d6262117122dc8af0a0e6fc63ed2c25c88 (patch)
treec394be44bd65b8e4b7be4d8c90e3608400e148fc /config.hs
parentc0a2701284a800f55abdd61f0b8619582c399a9e (diff)
parentab7a7f421c9b57b5963a44e57a6a4df7c594aca6 (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