summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-10-13 21:02:54 -0400
committerJoey Hess2018-10-13 21:02:54 -0400
commit81a82d4d40734e655004f91fa6f0797451f146f1 (patch)
tree3225aa9bf02a95bff8f57b0c868bd84fad9c4ce0
parentc1e5f440c696e05f2dd11b763488584466e4910a (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