summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-02-04 11:54:17 -0400
committerJoey Hess2018-02-04 11:54:17 -0400
commit50600a71877fed94dae567a6ef5fc3b15c62b9b9 (patch)
tree1d28441cda0f7a2588d3bad4adb51275df991252
parentc530dffb7aea8e05cc8184be634a39908780a981 (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