summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2020-05-01 15:21:05 -0400
committerJoey Hess2020-05-01 15:21:05 -0400
commit7859c8c02b422229fbcbc5c26dad378fca5c9e88 (patch)
treea1037135f35e1dd934fb8ab2462f011bf9d282e1 /config.hs
parentdc3a04ae10addd701cc5cce59b2ad8931fa656ba (diff)
parentcc3289f70f09d2fa061cc21e47ea44d4b374dadd (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