summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-05-10 12:07:18 -0400
committerJoey Hess2016-05-10 12:07:18 -0400
commit7cc4dbb7bcf13a57cbda9c65dea4b49722dd6806 (patch)
treee208d1b43fb8efe808625def2b1501e2d04a15c8
parentc0b38a56ec9bdd85900fca3c040de85ef814bc1d (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