summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-06-23 15:18:55 -0400
committerJoey Hess2018-06-23 15:18:55 -0400
commit43ea58db80e2f549f43ac4485ca5453391a641db (patch)
tree70c3aad6d806474999762cf20e0613623c8ecc97
parent7f043301bf5a22731b766e9dfe6ad357cc1840c1 (diff)
parent15de86a653540535f5496712e21c55eee69711cf (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