summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2019-10-08 16:59:28 -0400
committerJoey Hess2019-10-08 16:59:28 -0400
commit09e97fa5f5e51b599b0ce9b263b82dd61fce0ba5 (patch)
tree587bfdbc0584d48f9766243618f1a69db2df9bb0 /config.hs
parenta820c5c9ed876c70cf18c141cd6be471313dad65 (diff)
parentc97619e860a09606e56a3da27b4984ea329ef063 (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