summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2020-06-17 18:01:46 -0400
committerJoey Hess2020-06-17 18:01:46 -0400
commit9cdb26dd56ae74a07da3833bb684f5b51db27b35 (patch)
tree3ca1727dcbc6965e412feb1dca2e6f0dc8b43ff4
parent1585784507441f97a829c2d7d77dcf2072e4bbec (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