summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-28 11:39:02 -0400
committerJoey Hess2016-03-28 11:39:02 -0400
commit1e2aa0a5d54efc0f393a3a0d92863583e4c7c02b (patch)
tree440e7038ed02a2b7fa906c9f6f6848598f25897a
parent0dd226736313e51b896eacc5498b3964bf04e5c1 (diff)
parentd9b5237036c008ffa2f3f41c18c51ab2689fbb6a (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