summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 20:19:28 -0400
committerJoey Hess2016-03-07 20:19:28 -0400
commit3137c266b0082cf33d0cf747b2a2ea0929ca2d92 (patch)
tree0add1fe9d56e67c20743682e0919662908d8785a
parenta3dd04bfe6427845f92b7233d7e43c1bbcae1c2e (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