summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2018-02-27 12:09:46 -0400
committerJoey Hess2018-02-27 12:09:46 -0400
commit3919fa183bce29d4fbdbdcc4bd780e462dd6700f (patch)
tree1e549d69ec771d7f5505b94c93c5843bd44850fb /config.hs
parent3e1d8b6b6cbbb4d9560fb0d2ea1aec22e5f19239 (diff)
parent094a6419f7e5ddb0566e10ef4122306187dc00d7 (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