summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-07-26 20:02:47 -0400
committerJoey Hess2017-07-26 20:02:47 -0400
commit41ce00bdb0fee2b68fb33d53b535b843c134aff8 (patch)
tree84c1282325f925c7b71d557e079359b8a4f3e5f9
parent136b4d74c7deeff52c3c27754b68a8e81ef20863 (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