summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-04-15 19:03:26 -0400
committerJoey Hess2016-04-15 19:03:26 -0400
commitc7bacb2f33b0d539a108dc8f6636e71574c47d53 (patch)
treea3bde6522ff3b534e6f36eba92f907cd4b18ff6f
parent5993b2677ff8c3c9ef9f085f2b1ca90153cb13b6 (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