summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-17 20:05:41 -0400
committerJoey Hess2014-04-17 20:05:41 -0400
commit88b1724713b91fb7458ca527916247d0d53b9560 (patch)
treed74292d9e11b5660a1a650e7b3fc7aa0878fcc30 /config.hs
parent312a9c3fc99ab16876b0edaf491a46c737d802b3 (diff)
parentd934c95b96ce5c770acf3482ab64383266cbb997 (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..07959a0a 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+config-joey.hs \ No newline at end of file