summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-04-03 14:56:55 -0400
committerJoey Hess2017-04-03 14:56:55 -0400
commitcd4a20edba2537deb99fbb43cabd6571751cd97a (patch)
tree44cbf3e89bac9b86af24df50b4f0bc9a8c3b115f
parentd5de19a95e2311b3bd77e9d96efd5b95b23d3f0a (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