summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2017-07-26 23:40:47 -0400
committerJoey Hess2017-07-26 23:40:47 -0400
commita9eac78268e28d7194d3f9f4a382ff6658defb0c (patch)
tree9afc43cd3b71fb8ad47fd35c3e66440b54689406 /config.hs
parent989cf9823fe5e5efb57d6a08da18bb46f548cdbe (diff)
parent89816fb838873fc97ffa9d3827440bebb848c140 (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