summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-08-19 23:32:32 -0400
committerJoey Hess2018-08-19 23:32:32 -0400
commit90669ff9ef2e941265828bdff06233c379d06d8d (patch)
treeea26616128e684340475b1cffc6c2c9ee75b7c00
parent7c4e4f267a99b4e4bfc92c9d1adfe30ac5d6816c (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