summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 01:12:44 -0400
committerJoey Hess2014-04-04 01:12:44 -0400
commit8bb175d1078de6add55f5c5f689693495d141436 (patch)
tree74173c19b2b293b94d993398c41a3063d2f5b364 /config.hs
parenteea8637afe78ceff25ddd11d365a3fc022cc5fa4 (diff)
parentccc82907124ccd2ad4951c2c4946ae20af007530 (diff)
Merge branch 'joeyconfig'
Conflicts: config.hs
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..6cc82063 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-config-simple.hs \ No newline at end of file
+Propellor/Config/Simple.hs \ No newline at end of file