summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-05-02 09:57:53 -0400
committerJoey Hess2016-05-02 09:57:53 -0400
commit6f3a19973ef03c80d634d2cb64d2a72af4fb3548 (patch)
tree6f37717095ca673f56dd6f60c1985a74cb7ac562
parent0277b0e35c925da37dc8d40fe281034fc77afa46 (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