summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-06-10 14:59:40 -0400
committerJoey Hess2016-06-10 14:59:40 -0400
commit5608ab99f3aa058a196a7dfaf2b5ec123b5dad70 (patch)
tree36fe833d85386ae8a4637e1956b4f2feba4687a0 /config.hs
parente9a09eed901fc8ff40c7debef02fb6b0ed48b165 (diff)
parente56d193951672bc13aca88b17704160703fcad8b (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