summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-08-01 17:59:06 -0400
committerJoey Hess2017-08-01 17:59:06 -0400
commit55f7540fed4d6defc702ef8d16af037d1a72b83b (patch)
treef5acfa744b634fd1a56bd254df0c9527a6011078
parent1a78b66631f29852c3d4af1695153c5e5e1efdd8 (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