summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2019-02-13 17:56:31 -0400
committerJoey Hess2019-02-13 17:56:31 -0400
commit54602f4c9c6d7102f4d5e68132e83a22b934224f (patch)
tree37bf6bb14df6f762a046ee2352c6a046eb42042f
parent218579e21b03226f6d3064cd263f18c8c1d3a6b1 (diff)
parente0ba1f3739179560f6ae0b913859f110b8c97e36 (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