summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-07-15 18:42:43 -0400
committerJoey Hess2017-07-15 18:42:43 -0400
commita1e622249c316189df1f8772c0bf2d75f474cf97 (patch)
treeb15561b8e3d142e1ceaa5d73d35fdfd0810eb977
parentd530acecd938050d1bdd573976f930fb19fe9487 (diff)
parent9ebb533b255427031bee82ff57f7e3c1e79b793b (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