summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-04-09 17:53:10 -0400
committerJoey Hess2017-04-09 17:53:10 -0400
commit3d74dc804611fb95832bb4e093f12c59238aff87 (patch)
tree5d55d35df055c187377f3a787e11644e9f0f9d92
parent8d02f00412cc57a909a0cf0567c106108e19ab4c (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