summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-11-11 17:54:40 -0400
committerJoey Hess2016-11-11 17:54:40 -0400
commitbfa42b41d215ed2c31c4b82d8b055c939c6bcec3 (patch)
treebcf9c888a958b06987b6a26ad183f40e1da606f8
parent4cbcfd3c386efb094b9e21dcb6e32111f9431f84 (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