summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-05-06 11:05:46 -0400
committerJoey Hess2018-05-06 11:05:46 -0400
commitee9e623a3858ae3aa20980d2ff3bbe388bd97003 (patch)
tree8a605f4462d6a58aa2b9e19fed5de3618e5bb36f
parentb6fe3fdc3aa0a24f34dab254f26ff96d1ba544ab (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