summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-04-15 19:03:26 -0400
committerJoey Hess2016-04-15 19:03:26 -0400
commit5993b2677ff8c3c9ef9f085f2b1ca90153cb13b6 (patch)
tree871988b8cb358f0908e99a5dd54a90aa56d0b3c1
parent08ed002cb572c5db1919f548471d9c1f0d9aae3f (diff)
parent8476b10bb21b76c21ef251f99188f6a64fda2b41 (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