summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-04-23 15:20:52 -0400
committerJoey Hess2018-04-23 15:20:52 -0400
commit6b4e73dab2fed4310ed6276bc83ae320fef0ae26 (patch)
tree294299b4ba5ff0a81db8e389cc4c49fb3e0ef762
parentf2bb9a3db7ccb5fc0e64920017d305715b34ba95 (diff)
parent3bfae184bdc31cc21c2dc77ed9d4c5641c88571e (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