summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-12-29 12:28:17 -0400
committerJoey Hess2017-12-29 12:28:17 -0400
commitea631e8519106a09d869fda6d54d1fd2d808169a (patch)
tree080b91b4b65b7477aae929da108f2f98f5d46942
parentef249b5dff438166e0b5f855c46a502ee0c1161b (diff)
parent0d6b6bb8c68d7cf8eaa1ff9d6a2133ecb11a6a21 (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