summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-07-25 15:51:31 -0400
committerJoey Hess2017-07-25 15:51:31 -0400
commitb20a3cb48fb632140d6d3cc160886637c6ff1d86 (patch)
tree3f53fa59a0b6e099acf579d2aa46c2e1bf37ba21
parent4137c20b59a4da4d4e1e2f10d971c7a65b94aed9 (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