summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-05-23 11:25:41 -0400
committerJoey Hess2016-05-23 11:25:41 -0400
commit9435ca9d7916c59fa37e2e4c3983dcd6eb20d8c0 (patch)
treec7cea9fad8eb237f3aee7543fbcbc81b368cf7ef /config.hs
parent7869b471f953c16fa73bc45f3651dba6138a1af6 (diff)
parent864d47361ba34d851a9bbb34a6242854c042e556 (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