summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-02-04 11:59:15 -0400
committerJoey Hess2018-02-04 11:59:15 -0400
commit24c02203da629dce12d22436debbd1447464af34 (patch)
treef9ad5d66f867e87f1e8cf4eaf744df2fc4e3fb2f
parentdcae58d6262117122dc8af0a0e6fc63ed2c25c88 (diff)
merge master
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