summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-06-18 19:29:17 -0400
committerJoey Hess2017-06-18 19:29:17 -0400
commit4c4e851a1e6f726f7a3db41e9bcfb6fda6dc9a80 (patch)
treee29ac00faafb4bf4331554a846ba20af44f0eb3f
parentda0b27d54c8834f2db11fedc56098afbd8f89070 (diff)
clean up after merge
l---------config.hs2
-rw-r--r--privdata/relocate1
2 files changed, 1 insertions, 2 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file
diff --git a/privdata/relocate b/privdata/relocate
deleted file mode 100644
index 271692d8..00000000
--- a/privdata/relocate
+++ /dev/null
@@ -1 +0,0 @@
-.joeyconfig