summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-08-16 11:39:29 -0400
committerJoey Hess2018-08-16 11:39:29 -0400
commit40f25ee970d5279e1dc71e19484fbb72749be675 (patch)
tree0cdba8f389d8f0c73b6cd107a0a32687b884f420
parent0a887ec03de555a23b48ebec91cc7b79ae39df93 (diff)
parent66523bd3974290b5d1180a902cb9b860da430a38 (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