summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-05-05 10:38:01 -0400
committerJoey Hess2016-05-05 10:38:01 -0400
commit6b54a846bbe82c4c413a2d5d9031895f38377754 (patch)
treeb7385c0526ccd95b6f80bd0004496da5e529bf39 /config.hs
parent1e12a3a8c4fd0a5b027ff7923bb014b7836f8fd9 (diff)
parent6f3a19973ef03c80d634d2cb64d2a72af4fb3548 (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