summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-07-06 17:03:13 -0400
committerJoey Hess2017-07-06 17:03:13 -0400
commitf0c2dbe74597ec0cf5d517eff3e2bf7b7ded5ea6 (patch)
treea22c7cca1790795a3382c60f4499e6ac7b935497
parent7776dd215ec165576c67f39741688e79c7c7e11c (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