summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-07-29 10:52:40 -0400
committerJoey Hess2016-07-29 10:52:40 -0400
commit7a188d4dec345dcb45d9e5193eba6da098491fc2 (patch)
treeca569c206eb018a89a0c78cad68874c127de6ee9 /config.hs
parent808f33fd2418ed9a64f20846cf7301c16ffe8b84 (diff)
parente6940f49e248ff57f4baf60ba72a03c09c82d5e0 (diff)
Merge remote-tracking branch 'spwhitton/robust-rngd' 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