summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2019-07-01 12:14:55 -0400
committerJoey Hess2019-07-01 12:14:55 -0400
commit9e372de7d5dda142a73aa8d14263136dfd6a9fe3 (patch)
tree0c9cf3a5eab205b55826e2505a0f0eedbdff653d /config.hs
parent394267002a8e63e52035919e4b35ee43cc940019 (diff)
parentccb2c08c1537766338755e4bf97a7d15c2162ef3 (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