summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2017-05-15 20:12:08 -0400
committerJoey Hess2017-05-15 20:12:08 -0400
commitd3b49aa149ea8ac9052b5b3d2a048206a7293301 (patch)
treed1fd7e951fe508a2f38b79796e8522d5c20ede4b /config.hs
parentba3bd76f4ade7ffeea3c1837f868f5264d284a8c (diff)
parent8364547bf2b6a5e5184b2abc79938786d8efc55b (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