summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2018-05-06 11:05:31 -0400
committerJoey Hess2018-05-06 11:05:31 -0400
commit65c50524b3ef6f461baad7d83a8b29581d06e93f (patch)
tree1bba25875d2d64a5726d2ebeddbf8bd19d80854f /config.hs
parent44eac317e72df5c2b433527800a00315659a9d4f (diff)
parent7e67310cf3c9f5cb1ac1fd51582960883e9b1c34 (diff)
Merge remote-tracking branch 'felix/unbound' 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