summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-02-20 13:49:18 -0400
committerJoey Hess2017-02-20 13:49:18 -0400
commitee6b3fab2b79d86ca91d80b0711bf7f41b532355 (patch)
tree782508a1aef2c48bb7dd227acca6b4ab292ed5ca
parentaedf8c5fc5a11b12458b67e5245bec25195c9233 (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