summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2019-04-05 11:59:48 -0400
committerJoey Hess2019-04-05 11:59:48 -0400
commit42230af8eea62f61293342c2e58fb525b72a1997 (patch)
tree254807d9930c827955ce0185d90db4091457b3cd
parent496f0458485ad2a0008a55858f571a0d89aefd72 (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