summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2018-04-29 14:01:18 -0400
committerJoey Hess2018-04-29 14:01:18 -0400
commit45509984bb93c24a17228fd41058da7f039b54d6 (patch)
tree553239ab39c7e1bee343db44ee725f60eb2ebe88 /config.hs
parent279fe0fd88999919e70b07bda5f89f030dbfaaa1 (diff)
parent6b6d11a7cd4eba3adbfd4e63469f968fcfcf5dc0 (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