summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-10-04 13:29:48 -0400
committerJoey Hess2017-10-04 13:29:48 -0400
commit6714b513d2b7c254953cc25a7eddc50e15e22af5 (patch)
treed0400e964fe0c5d2f5d2839dbdd5678fdc6f0dd5
parent958b736a24e8c958cdcb5099df9e1b54fac8532a (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