summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-04-30 15:47:28 -0400
committerJoey Hess2016-04-30 15:47:28 -0400
commiteb0a945d43c909273ffd9472c091db917ed6c1e2 (patch)
tree0c9f95a3a543cf8fa85dfede4ab565fa00b43736 /config.hs
parent6e09ae96c03ebc589ae9bb647e30de19fbe2f2e7 (diff)
parent60b12654b0746f9c35a38002d34e9ac69f76c738 (diff)
Merge branch '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 ec313725..97d90636 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+joeyconfig.hs \ No newline at end of file