summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-08-08 10:21:12 -0400
committerJoey Hess2018-08-08 10:21:12 -0400
commit71fbadb833d4b1c2e8d208623dbe5408f8abc048 (patch)
treeb5877bdc429943468f22f72df1274cf74eccd37f
parentc7f1d72d466acd85c0a0747053dda29204cb34c8 (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