summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-06-18 01:21:47 -0400
committerJoey Hess2016-06-18 01:21:47 -0400
commite5bc08598a44e35c80e2f335974f1f7374fb5e02 (patch)
tree55eb5883882b4ee5d156bc109654d50eb7be46e3
parent308e0447a3cb27f20256ba31c2e1b8f6b52c9e1a (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