summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-10-15 15:29:30 -0400
committerJoey Hess2017-10-15 15:29:30 -0400
commit077ee54e458d52057ea147ea25078bf376d76fa8 (patch)
treea99959697ad32e391983d70cc3757d9369f904bc
parent9e8f59c9c62a5b2bd8ff3441ebb6143e7a5a95f6 (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