summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-08-16 11:36:27 -0400
committerJoey Hess2018-08-16 11:36:27 -0400
commitcc0f53ab0f3a62607b6f609763b7e33bf99b854b (patch)
tree88f3433de40985c4358f16cc4443d6b252747bd1
parent6eb3b9325aba0935d43d4cdedc78c1b5f335dbbe (diff)
parent64eff7cdb6b394fb1c6b36f3a7f893a8af5eaa54 (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