summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-07-27 09:17:30 -0400
committerJoey Hess2017-07-27 09:17:30 -0400
commiteec97ebad16bb8e40e0158c787d28b4286a31457 (patch)
tree2ac9d8b936797bef19c77ef673d2f13bf6615c45
parent5faa18a5b7b166c420423e587b595d25a539a52d (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