summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2019-07-02 16:26:39 -0400
committerJoey Hess2019-07-02 16:26:39 -0400
commit34c88710166f7e55016bcb6e1935d303861c77c1 (patch)
tree4a5de468483359861a49606d52801d65a32755d3
parent603c8e07579628976c4c4961ea43f090a098c6a2 (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