summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-05-02 09:57:53 -0400
committerJoey Hess2016-05-02 09:57:53 -0400
commit0277b0e35c925da37dc8d40fe281034fc77afa46 (patch)
treeef374f3a91039950cbbfb06342a405bae0629456
parentfffa495d9170ef988131c2d3609221b8ba67c2a3 (diff)
parent97cfa21427e5186e40afdf57556a8ee6b13ee970 (diff)
Merge branch 'joeyconfig'
l---------config.hs2
-rw-r--r--privdata/relocate1
2 files changed, 2 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
diff --git a/privdata/relocate b/privdata/relocate
new file mode 100644
index 00000000..271692d8
--- /dev/null
+++ b/privdata/relocate
@@ -0,0 +1 @@
+.joeyconfig