summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2019-07-02 00:40:45 -0400
committerJoey Hess2019-07-02 00:40:45 -0400
commitd8ba8acbc58498641b729d7068d9e0b6c93c890b (patch)
tree13c79ae8e9f46cf6c9ec5353ca366555da0e0ab1
parente20662e6a8881db55394a6366be17ca4e509bc2a (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