summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2017-04-09 17:52:04 -0400
committerJoey Hess2017-04-09 17:52:04 -0400
commitb0cb72410d59a5a111d4235dec05fda666ee6ff8 (patch)
treeede43750e4e95d9090ccb19beff067a2facb5035 /config.hs
parent6a632221a2d2d1e31859c8deb79543056224a76f (diff)
parent57525e0d0d1d300aa807f1c876945ee5e38a29df (diff)
Merge remote-tracking branch 'origin' 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