summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-04-30 15:47:29 -0400
committerJoey Hess2016-04-30 15:47:29 -0400
commit84346a578f266b7cfb5a6edfa7a802e8d4dff054 (patch)
tree75c1ee0e7a7ed9d1a610a369ad66b344210a4edc
parenteb0a945d43c909273ffd9472c091db917ed6c1e2 (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