summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2018-07-11 12:12:57 -0400
committerJoey Hess2018-07-11 12:12:57 -0400
commit45350d2905e362bfbeacf8e625ee2f37c1710b0d (patch)
tree2bdbbaa47d91b56df56a8909a49c2741d05e1f2b /config.hs
parent58a7ba614753e5462b08ef91dd2663e70cd7742c (diff)
parentece3849c9df1acc48a40c9d3d2e627fb9f33a8e0 (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