summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-24 14:56:20 -0400
committerJoey Hess2016-03-24 14:56:20 -0400
commita3a771f0ca82ba709ccfd1e15b10df6070b176ac (patch)
treef0c0b3644d6ee27a5e940cdeb9d4856b7aeb30bd
parenta21bb7787b876999b043314a584d17d058a17142 (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