summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-09-20 11:36:44 -0400
committerJoey Hess2016-09-20 11:36:44 -0400
commitb9f87f0c08d94c5d43224a2c6bbacb332ebfc1b6 (patch)
tree7706d5680d13d9c4583fb323df5450c248735774
parent7e28749eff4018ed5b0ef72c4d757a8e4672ef5a (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