summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-28 11:39:03 -0400
committerJoey Hess2016-03-28 11:39:03 -0400
commitd93785ef619cb03506f34200a011c281ed545768 (patch)
treea28d7f1053b139f30f7dd6e93c337b067019a48a
parent1e2aa0a5d54efc0f393a3a0d92863583e4c7c02b (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