summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-01-02 17:20:31 -0400
committerJoey Hess2018-01-02 17:20:31 -0400
commit70d88674331a10b8287c1c11993eb1aaddc94536 (patch)
treeabadf63088cb22224ebbadd69e10bb47b9483dad
parentca30cf65e08990a5cc6b0d1ce6844b0cf52deb96 (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