summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2016-11-04 12:31:57 -0400
committerJoey Hess2016-11-04 12:31:57 -0400
commita9fb42faeb101d2ba33b21787d65a79569457a6e (patch)
treeb16ca9df5051a43bedfdd6554ace206fd20234aa /config.hs
parente8dfd6b6d8ddf11eb062eaff5eea2335f78acf2f (diff)
parenta271e8abe2845461585c94274884d3d616c77595 (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