summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-05-10 12:07:17 -0400
committerJoey Hess2016-05-10 12:07:17 -0400
commitc0b38a56ec9bdd85900fca3c040de85ef814bc1d (patch)
treec94269dad28df73698d6593d2462f84892092f54 /config.hs
parente4d412261c56696ab680bf607e3b7ca6182a0757 (diff)
parentfc75b2b9ab929f921512dafe69465106f497ad20 (diff)
Merge branch '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 ec313725..97d90636 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+joeyconfig.hs \ No newline at end of file