summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-07-28 11:47:13 -0400
committerJoey Hess2017-07-28 11:47:13 -0400
commita7a2c086e469c5f562b95d68c970bd326517c8b5 (patch)
treedff1a3ea8c72b0a755a6e8676eb1053e7ec87824
parent417412207725a3c99c6fd9871eab8080356b20b2 (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