summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2017-08-23 11:40:31 -0400
committerJoey Hess2017-08-23 11:40:31 -0400
commit5aeba7c622174307e05256afcb7e1ab4e734b0cf (patch)
tree266b37c12d1d83aa5b7c901de104fd02ed8de059 /config.hs
parenta11d4b95d53e526244fdf5e6d5913b9b442cb4e7 (diff)
parent656458f9c04a3c329fefb49de85f83c30d751e36 (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