summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-06-14 00:03:49 -0400
committerJoey Hess2016-06-14 00:03:49 -0400
commit0c6dd6b3b39a1e4b1b350d7712cab74579cffbb5 (patch)
tree43af057ccbc00e83c05c05b6251d76da8b412541
parent022a786ad990d4f76af6812a0a9256fd7e5c2b76 (diff)
parentb92dfd1d85e2d74ff6c56fd49fa13a7b1b62e364 (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