summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-12-31 12:16:29 -0400
committerJoey Hess2017-12-31 12:16:29 -0400
commitfb8fa3b07603d1be939c998008e162fac9c71525 (patch)
tree9c82a3f374f9e4e5d3a1f07f9216ae51aef19f2f
parent2a12188e8b848fdabd86c4fa936fb2e85ede6ac9 (diff)
parentf1ee04fba901d4ea171bf3c3ec489d776e0b02f5 (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